Merge branch 'master' of github.com:Eugeny/terminus

terminus-terminal/src/components/terminalSettingsTab.component.pug

@@ -247,6 +247,15 @@ h3.mt-2.mb-2 Behaviour
                 (ngModelChange)='config.save()',
             )
 
+        .form-group
+            label Working directory
+            input.form-control(
+                type='text',
+                placeholder='Home directory',
+                '[(ngModel)]'='config.store.terminal.workingDirectory',
+                (ngModelChange)='config.save()',
+            )
+
         .form-group
             label Auto-open a terminal on app start
             br
@@ -270,7 +279,6 @@ h3.mt-2.mb-2 Behaviour
                     )
                     | On
                     
-    .col-md-6
         .d-flex
             .form-group.mr-3
                 label Terminal bell

terminus-terminal/src/config.ts

@@ -15,6 +15,7 @@ export class TerminalConfigProvider extends ConfigProvider {
             customShell: '',
             rightClick: 'menu',
             copyOnSelect: false,
+            workingDirectory: '',
             colorScheme: {
                 __nonStructural: true,
                 name: 'Material',

terminus-terminal/src/services/terminal.service.ts

@@ -33,8 +33,12 @@ export class TerminalService {
     }
 
     async openTab (shell?: IShell, cwd?: string): Promise<TerminalTabComponent> {
-        if (!cwd && this.app.activeTab instanceof TerminalTabComponent) {
-            cwd = await this.app.activeTab.session.getWorkingDirectory()
+        if (!cwd) {
+            if (this.app.activeTab instanceof TerminalTabComponent) {
+                cwd = await this.app.activeTab.session.getWorkingDirectory()
+            } else {
+                cwd = this.config.store.terminal.workingDirectory || null
+            }
         }
         if (!shell) {
             let shells = await this.shells$.toPromise()

terminus-terminal/src/shells/wsl.ts

@@ -25,7 +25,10 @@ export class WSLShellProvider extends ShellProvider {
         return [{
             id: 'wsl',
             name: 'Bash on Windows',
-            command: wslPath
+            command: wslPath,
+            env: {
+                TERM: 'xterm-color',
+            }
         }]
     }
 }