Merge remote-tracking branch 'upstream/master' into ELECTRON-197

README.md

@@ -64,4 +64,6 @@ In order to achieve those goals Symphony is participating and working in close c
 - Remote logging is enabled for local and production cases and are sent to the backend server via the remote objects
 
 ## Misc notes
-If desiring to run against server without proper cert use cmd line option: --ignore-certificate-errors
+- If desiring to run against server without proper cert use cmd line option: --ignore-certificate-errors
+- To start additional instance with custom data directory (if you want seperate user) use cmd line options: --multiInstance --userDataPath=<path to data dir>
+  - if directory doesn't exist, it will be created 

installer/mac/postinstall.sh

@@ -4,24 +4,24 @@
 tempFilePath='/tmp/sym_settings.txt'
 installPath="$2"
 configPath="/Symphony.app/Contents/config/Symphony.config"
-newPath=$installPath$configPath
+newPath=${installPath}${configPath}
 
 ## Get Symphony Settings from the temp file ##
-pod_url=$(sed -n '1p' $tempFilePath);
+pod_url=$(sed -n '1p' ${tempFilePath});
 minimize_on_close=$(sed -n '2p' '/tmp/sym_settings.txt');
 launch_on_startup=$(sed -n '3p' '/tmp/sym_settings.txt');
 always_on_top=$(sed -n '4p' '/tmp/sym_settings.txt');
 
 ## Replace the default settings with the user selected settings ##
-sed -i "" -E "s#\"url\" ?: ?\".*\"#\"url\"\: \"$pod_url\"#g" $newPath
-sed -i "" -E "s#\"minimizeOnClose\" ?: ?([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])#\"minimizeOnClose\":\ $minimize_on_close#g" $newPath
-sed -i "" -E "s#\"alwaysOnTop\" ?: ?([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])#\"alwaysOnTop\":\ $always_on_top#g" $newPath
-sed -i "" -E "s#\"launchOnStartup\" ?: ?([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])#\"launchOnStartup\":\ $launch_on_startup#g" $newPath
+sed -i "" -E "s#\"url\" ?: ?\".*\"#\"url\"\: \"$pod_url\"#g" ${newPath}
+sed -i "" -E "s#\"minimizeOnClose\" ?: ?([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])#\"minimizeOnClose\":\ $minimize_on_close#g" ${newPath}
+sed -i "" -E "s#\"alwaysOnTop\" ?: ?([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])#\"alwaysOnTop\":\ $always_on_top#g" ${newPath}
+sed -i "" -E "s#\"launchOnStartup\" ?: ?([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])#\"launchOnStartup\":\ $launch_on_startup#g" ${newPath}
 
 ## Remove the temp settings file created ##
-rm -f $tempFilePath
+rm -f ${tempFilePath}
 
 ## For launching symphony with sandbox enabled, create a shell script that is used as the launch point for the app
-EXEC_PATH=$installPath/Symphony.app/Contents/MacOS
-exec $EXEC_PATH/Symphony --install $newPath $launch_on_startup
-chmod 755 $EXEC_PATH/Symphony
+EXEC_PATH=${installPath}/Symphony.app/Contents/MacOS
+exec ${EXEC_PATH}/Symphony --install ${newPath} ${launch_on_startup}
+chmod 755 ${EXEC_PATH}/Symphony

js/main.js

@@ -66,8 +66,10 @@ const shouldQuit = app.makeSingleInstance((argv) => {
     processProtocolAction(argv);
 });
 
-// quit if another instance is already running, ignore for dev env
-if (!isDevEnv && shouldQuit) {
+let allowMultiInstance = getCmdLineArg(process.argv, '--multiInstance', true) || isDevEnv;
+
+// quit if another instance is already running, ignore for dev env or if app was started with multiInstance flag
+if (!allowMultiInstance && shouldQuit) {
     app.quit();
 }
 
@@ -155,6 +157,12 @@ function setupThenOpenMainWindow() {
     // allows installer to launch app and set appropriate global / user config params.
     let hasInstallFlag = getCmdLineArg(process.argv, '--install', true);
     let perUserInstall = getCmdLineArg(process.argv, '--peruser', true);
+    let customDataArg = getCmdLineArg(process.argv, '--userDataPath=', false);
+    
+    if (customDataArg && customDataArg.split('=').length > 1) {
+        let customDataFolder = customDataArg.split('=')[1]; 
+        app.setPath('userData', customDataFolder);
+    }
     if (!isMac && hasInstallFlag) {
         getConfigField('launchOnStartup')
             .then(setStartup)
@@ -172,9 +180,8 @@ function setupThenOpenMainWindow() {
         let launchOnStartup = process.argv[3];
         // We wire this in via the post install script
         // to get the config file path where the app is installed
-        let appGlobalConfigPath = process.argv[2];
         setStartup(launchOnStartup)
-            .then(() => updateUserConfigMac(appGlobalConfigPath))
+            .then(updateUserConfigMac)
             .then(app.quit)
             .catch(app.quit);
         return;
@@ -193,18 +200,15 @@ function setupThenOpenMainWindow() {
  * @returns {Promise}
  */
 function setStartup(lStartup) {
-    return symphonyAutoLauncher.isEnabled()
-        .then(function(isEnabled) {
-            if (!isEnabled && lStartup) {
-                return symphonyAutoLauncher.enable();
-            }
-
-            if (isEnabled && !lStartup) {
-                return symphonyAutoLauncher.disable();
-            }
-
-            return true;
-        });
+    return new Promise((resolve) => {
+        let launchOnStartup = (lStartup === 'true');
+        if (launchOnStartup) {
+            symphonyAutoLauncher.enable();
+            return resolve();
+        }
+        symphonyAutoLauncher.disable();
+        return resolve();
+    });
 }
 
 /**

js/windowMgr.js

@@ -347,6 +347,12 @@ function doCreateMainWindow(initialUrl, initialBounds) {
                 if (browserWin) {
                     log.send(logLevels.INFO, 'loaded pop-out window url: ' + newWinParsedUrl);
 
+                    if (!isMac) {
+                        // Removes the menu bar from the pop-out window
+                        // setMenu is currently only supported on Windows and Linux
+                        browserWin.setMenu(null);
+                    }
+
                     getConfigField('url')
                     .then((podUrl) => {
                         getConfigField('crashReporter')