diff --git a/CHANGELOG.md b/CHANGELOG.md index d54f55c..1cdd577 100644 --- 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 index 7fbf541..34b176e 100644 --- a/lib/terminal-session.js +++ b/lib/terminal-session.js @@ -152,7 +152,7 @@ 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; } @@ -160,14 +160,14 @@ export default class TerminalSession { 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 index 2bb82fc..dcddc92 100644 --- 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",