bug fixes

mellow-io · Mar 8, 2020 · 071d1d4 · 071d1d4
1 parent 1f9565b
commit 071d1d4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/src/helper/darwin/install_helper b/src/helper/darwin/install_helper
@@ -18,3 +18,7 @@ chown root "$INSTALL_PATH/route"
 chmod +s "$INSTALL_PATH/core"
 chmod +s "$INSTALL_PATH/md5sum"
 chmod +s "$INSTALL_PATH/route"
+
+chmod +x "$INSTALL_PATH/core"
+chmod +x "$INSTALL_PATH/md5sum"
+chmod +x "$INSTALL_PATH/route"
diff --git a/src/helper/linux/install_helper b/src/helper/linux/install_helper
@@ -18,3 +18,7 @@ chown root "$INSTALL_PATH/ip"
 chmod +s "$INSTALL_PATH/core"
 chmod +s "$INSTALL_PATH/md5sum"
 chmod +s "$INSTALL_PATH/ip"
+
+chmod +x "$INSTALL_PATH/core"
+chmod +x "$INSTALL_PATH/md5sum"
+chmod +x "$INSTALL_PATH/ip"
diff --git a/src/main.js b/src/main.js
@@ -165,6 +165,7 @@ if (app.isPackaged) {
 
 var helperInstallPath
 var helperFiles
+var executableHelperFiles
 switch (process.platform) {
   case 'darwin':
     helperInstallPath = "/Library/Application Support/Mellow"
@@ -175,6 +176,11 @@ switch (process.platform) {
       'md5sum',
       'route'
     ]
+    executableHelperFiles = [
+      'core',
+      'md5sum',
+      'route'
+    ]
     break
   case 'linux':
     helperInstallPath = '/usr/local/mellow'
@@ -185,6 +191,11 @@ switch (process.platform) {
       'md5sum',
       'ip'
     ]
+    executableHelperFiles = [
+      'core',
+      'md5sum',
+      'ip'
+    ]
     break
 }
 
@@ -357,6 +368,15 @@ function checkHelper() {
       }
     }
   }
+  for (let f of executableHelperFiles) {
+    installedFile = path.join(helperInstallPath, f)
+    try {
+      execSync(util.format('sh -c "[ -x \'%s\' ]"', installedFile))
+    } catch (err) {
+      log.info('File requires execute permission', installedFile)
+      return false
+    }
+  }
   return true
 }
 
@@ -558,6 +578,9 @@ async function startCore(callback) {
     log.info('Core errored.')
     coreInterrupt = true
     core = null
+    if ((isDarwin || isWin32) && store.get('systemProxy')) {
+      configureSystemProxy(false)
+    }
     setState(state.Disconnected)
     log.info(err)
     dialog.showErrorBox('Error', util.format('Failed to start the Core, see "%s" for more details.', logPath))