Merge branch 'master' into dist

Author: JIB3377

package.json

@@ -17,12 +17,13 @@
       "target": [
         "deb"
       ],
-      "maintainer": "team spearmint"
+      "icon": "build/icon.*",
+      "maintainer": "Team Spearmint"
     }
   },
   "main": "public/electron.js",
   "bugs": {
-    "url": "https://github.com/oslabs-beta/spearmint_LA42/issues",
+    "url": "https://github.com/oslabs-beta/spearmint_LA42/issues"
   },
   "homepage": "./",
   "private": true,
@@ -39,6 +40,7 @@
     "dotenv": "^8.2.0",
     "electron-is-dev": "^1.1.0",
     "fibers": "^5.0.0",
+    "fix-path": "^3.0.0",
     "js-beautify": "^1.10.0",
     "monaco-editor": "^0.17.0",
     "node-pty": "^0.10.0",
@@ -57,7 +59,7 @@
     "xterm-for-react": "^1.0.4"
   },
   "scripts": {
-    "install-once": "concurrently \"npm i\" \"npm run electron-rebuild\"",
+    "install-once": "npm i && npm run electron-rebuild",
     "test": "react-app-rewired test --env=jsdom",
     "test:e2e": "./node_modules/mocha/bin/mocha src/__tests__/spec.e2e.js",
     "test:integra": "mocha src/__tests__/spec.integra.js",
@@ -112,4 +114,4 @@
     "spectron": "^5.0.0",
     "test-data-bot": "^0.8.0"
   }
-}
+}

public/AccLens_Demo.gif

@@ -6,10 +6,17 @@ const isDev = require('electron-is-dev');
 const fs = require('fs');
 const os = require('os');
 const pty = require('node-pty');
+const fixPath = require('fix-path');
 
 //Dynamic variable to change terminal type based on os
 const shell = os.platform() === 'win32' ? 'powershell.exe' : 'bash';
+console.log("process.env.Path1: ", process.env.PATH);
+//=> '/usr/bin'
 
+fixPath();
+
+console.log("process.env.Path2: ", process.env.PATH);
+//=> '/usr/local/bin:/usr/bin'
 let mainWindow;
 
 if (isDev) console.log('electron version', process.versions.electron);
@@ -53,6 +60,7 @@ function createWindow() {
     cwd: process.env.HOME,
     env: process.env,
   };
+  console.log("process.env.HOME: ", process.env.HOME);
 
   const ptyProcess = pty.spawn(shell, [], ptyArgs);
   // with ptyProcess, we want to send incoming data to the channel terminal.incData
@@ -125,7 +133,7 @@ ipcMain.on('OpenFolderButton.dialog', (e) => {
 UNIVERSAL IPC CALLS
 (The following IPC calls are made from various components in the codebase)
 */
-ipcMain.on('Universal.stat' , (e, filePath) => {
+ipcMain.on('Universal.stat', (e, filePath) => {
   e.returnValue = fs.statSync(filePath).isDirectory();
 });