OS X changes

electron.js

@@ -74,86 +74,84 @@ function createWindow() {
     mountedData = {};
   });
 
-  if ((os.platform() === 'win32') || (os.platform() === 'linux')) {
+  const appPath = (os.platform() === 'win32') ? path.resolve(path.join(app.getAppPath(), '..\\..\\repertory-ui.exe')) :
-    const appPath = (os.platform() === 'win32') ?
+    (os.platform() === 'darwin') ? app.getAppPath() :
-      path.resolve(path.join(app.getAppPath(), '..\\..\\repertory-ui.exe')) :
+    process.env.APPIMAGE;
-      process.env.APPIMAGE;
 
-    const autoLauncher = new AutoLaunch({
+  const autoLauncher = new AutoLaunch({
-      name: 'Repertory UI',
+    name: 'Repertory UI',
-      path: appPath,
+    path: appPath,
-    });
+  });
 
-    const image = nativeImage.createFromPath(path.join(__dirname, '/build/logo.png'));
+  const image = nativeImage.createFromPath(path.join(__dirname, (os.platform() === 'darwin') ? '/build/icon.icns' : '/build/logo.png'));
-    trayContextMenu = Menu.buildFromTemplate([
+  trayContextMenu = Menu.buildFromTemplate([
-      {
+    {
-        label: 'Visible', type: 'checkbox', click(item) {
+      label: 'Visible', type: 'checkbox', click(item) {
-          if (item.checked) {
+        if (item.checked) {
-            mainWindow.show();
+          mainWindow.show();
-            if (mainWindow.isMinimized()) {
+          if (mainWindow.isMinimized()) {
-              mainWindow.restore();
+            mainWindow.restore();
-            }
-            mainWindow.focus()
-          } else {
-            mainWindow.hide();
           }
-        },
+          mainWindow.focus()
-        checked: !launchHidden,
+        } else {
-      },
-      {
-        label: 'Auto-start', type: 'checkbox', click(item) {
-          if (item.checked) {
-            autoLauncher.enable();
-          } else {
-            autoLauncher.disable();
-          }
-        }
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Launch Hidden', type: 'checkbox', click(item) {
-          launchHidden = !!item.checked;
-          saveUiSettings();
-        },
-        checked: launchHidden,
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Exit and Unmount', click(item) {
-          closeApplication();
-        }
-      }
-    ]);
-
-    mainWindow.on('close', function (event) {
-      if (!isQuiting) {
-        event.preventDefault();
-        if (mainWindow.isVisible()) {
           mainWindow.hide();
-          trayContextMenu.items[0].checked = false;
-          mainWindowTray.setContextMenu(trayContextMenu);
         }
-        event.returnValue = false;
+      },
+      checked: !launchHidden,
+    },
+    {
+      label: 'Auto-start', type: 'checkbox', click(item) {
+        if (item.checked) {
+          autoLauncher.enable();
+        } else {
+          autoLauncher.disable();
+        }
       }
-    });
+    },
-
+    {
-    autoLauncher
+      type: 'separator'
-      .isEnabled()
+    },
-      .then((enabled) => {
+    {
-        trayContextMenu.items[1].checked = enabled;
+      label: 'Launch Hidden', type: 'checkbox', click(item) {
-
+        launchHidden = !!item.checked;
-        mainWindowTray = new Tray(image);
+        saveUiSettings();
-        mainWindowTray.setToolTip('Repertory UI');
+      },
-        mainWindowTray.setContextMenu(trayContextMenu)
+      checked: launchHidden,
-      })
+    },
-      .catch(() => {
+    {
+      type: 'separator'
+    },
+    {
+      label: 'Exit and Unmount', click() {
         closeApplication();
-      });
+      }
-  }
+    }
+  ]);
+
+  mainWindow.on('close', function (event) {
+    if (!isQuiting) {
+      event.preventDefault();
+      if (mainWindow.isVisible()) {
+        mainWindow.hide();
+        trayContextMenu.items[0].checked = false;
+        mainWindowTray.setContextMenu(trayContextMenu);
+      }
+      event.returnValue = false;
+    }
+  });
+
+  autoLauncher
+    .isEnabled()
+    .then((enabled) => {
+      trayContextMenu.items[1].checked = enabled;
+
+      mainWindowTray = new Tray(image);
+      mainWindowTray.setToolTip('Repertory UI');
+      mainWindowTray.setContextMenu(trayContextMenu)
+    })
+    .catch(() => {
+      closeApplication();
+    });
 }
 
 const instanceLock = app.requestSingleInstanceLock();

package.json

@@ -129,10 +129,10 @@
       "./helpers.js"
     ],
     "linux": {
-      "icon": "./build/icon.icns"
+      "icon": "./build/logo.png"
     },
     "mac": {
-      "icon": "./build/icon.icns"
+      "icon": "./build/icon_color.icns"
     },
     "win": {
       "icon": "./build/icon.ico"