🚑 Hotfix v2.2.1 - Fix handling of shell args #492

GitSquared · Apr 30, 2019 · a1114d9 · a1114d9
1 parent 2eb00ce
commit a1114d9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "edex-ui",
   "productName": "eDEX-UI",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A science fiction desktop running everywhere. Awesome.",
   "keywords": [
     "desktop",

diff --git a/src/_boot.js b/src/_boot.js
@@ -167,7 +167,7 @@ app.on('ready', async () => {
     if (!require("fs").existsSync(settings.cwd)) throw new Error("Configured cwd path does not exist.");
 
     // See #366
-    let cleanEnv = await require("shell-env")(settings.shell).catch(e => { throw e; });
+    let cleanEnv = await require("shell-env")(settings.shell.split(" ")[0]).catch(e => { throw e; });
 
     Object.assign(cleanEnv, process.env, settings.env, {
         TERM: "xterm-256color",

diff --git a/src/classes/terminal.class.js b/src/classes/terminal.class.js
@@ -397,7 +397,7 @@ class Terminal {
                 }
             }, 1000);
 
-            this.tty = this.Pty.spawn(opts.shell || "bash", opts.params || ["--login"], {
+            this.tty = this.Pty.spawn(opts.shell || "bash", (opts.params.length > 0 ? opts.params : ["--login"]), {
                 name: "xterm-256color",
                 cols: 80,
                 rows: 24,

diff --git a/src/package.json b/src/package.json
@@ -1,7 +1,7 @@
 {
   "name": "edex-ui",
   "productName": "eDEX-UI",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "eDEX-UI sci-fi interface",
   "keywords": [
     "desktop",