Fixed an issue that prevented shell-related configuration from being …

…used.
jsmecham · Mar 21, 2018 · 8463210 · 8463210
1 parent 8b67ae2
commit 8463210
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.5
+
+* Fixed an issue that prevented shell-related configuration (shell path, arguments and sanitized environment keys) from being used.
+
 ## 0.5.4
 
 * Added support for specifying a custom font family.

diff --git a/lib/terminal-session.js b/lib/terminal-session.js
@@ -152,22 +152,22 @@ export default class TerminalSession {
   get shellPath() {
     if (this._shellPath) return this._shellPath;
     return this._shellPath = this.config.shellPath
-      || atom.config.get('terminal-tab.shellPath')
+      || atom.config.get('terminal-tab.shellSettings.shellPath')
       || process.env.SHELL
       || process.env.COMSPEC;
   }
 
   get shellArguments() {
     if (this._shellArguments) return this._shellArguments;
     return this._shellArguments = this.config.shellArgs
-      || atom.config.get('terminal-tab.shellArgs')
+      || atom.config.get('terminal-tab.shellSettings.shellArgs')
       || '';
   }
 
   get sanitizedEnvironmentKeys() {
     if (this._sanitizedEnvironmentKeys) return this._sanitizedEnvironmentKeys;
     return this._sanitizedEnvironmentKeys = this.config.sanitizeEnvironment
-      || atom.config.get('terminal-tab.sanitizeEnvironment');
+      || atom.config.get('terminal-tab.shellSettings.sanitizeEnvironment');
   }
 
   getDefaultLocation() {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "terminal-tab",
   "main": "./lib/main",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "A simple terminal for panes and docks.",
   "author": {
     "name": "Justin Mecham",