Merge pull request #755 from kiike/pr/use_path_to_find_executables

utils: Use shelljs.which to get the path for an executable

app/package.json

@@ -79,6 +79,7 @@
     "rsyncwrapper": "~2.0.1",
     "select2": "~4.1.0-rc.0",
     "sha1": "~1.1.1",
+    "shelljs": "^0.8.5",
     "snapsvg": "~0.5.1",
     "spark-md5": "^3.0.1",
     "ssh-exec": "~2.0.0",

app/scripts/factories/node.js

@@ -77,6 +77,9 @@ angular.module('icestudio')
   .factory('nodeDebounce', function() {
     return require('lodash.debounce');
   })
+  .factory('shelljs', function() {
+    return require('shelljs');
+  })
   .factory('SVGO', function() {
     var config = {
       full: true,

app/scripts/services/utils.js

@@ -19,6 +19,7 @@ angular.module('icestudio')
     nodeLangInfo,
     SVGO,
     fastCopy,
+    shelljs,
     sparkMD5) {
 
     let _pythonExecutableCached = null;
@@ -112,24 +113,17 @@ angular.module('icestudio')
     }
 
     //---------------------------------------------------------
-    //-- Get the path of an executable using the `which` utility
+    //-- Get the path of an executable using the `which` shelljs module
     //--
     //-- INPUTS:
     //--   -executable: string for an executable
     //-- OUTPUTS:
     //--   string: the path to the executable
-    //--   null: `which` is unavailable or execution error
+    //--   null: executable not found
     function getExecutablePath(executable) {
-      const command = `which ${executable}`;
-      try {
-        const result = nodeChildProcess.execSync(command);
-        if (result !== false && result !== null) {
-          return result.toString();
-        }
-      } catch (e) {
-          console.error(e);
-      }
-      return null;
+      // split executable at first space to account for e.g. `python.exe -3`
+      executable = executable.split(" ")[0]
+      return shelljs.which(executable)
     }
 
 
@@ -1683,4 +1677,4 @@ angular.module('icestudio')
       }, 50);
     };
 
-  });
+  });