railsware#800: proper fix for shell aliases

ForNeVeR · May 22, 2017 · 8438c06 · 8438c06
1 parent 0aa5b6c
commit 8438c06
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/src/shell/Aliases.ts b/src/shell/Aliases.ts
@@ -1,15 +1,11 @@
-import {executeCommandWithShellConfig} from "../PTY";
+import {loginShell} from "../utils/Shell";
 import * as _ from "lodash";
 
 export const aliasesFromConfig: Dictionary<string> = {};
 
 export async function loadAliasesFromConfig(): Promise<void> {
-    try {
-        //const lines = await executeCommandWithShellConfig("alias");
-        //lines.map(parseAlias).forEach(parsed => aliasesFromConfig[parsed.name] = parsed.value);
-    } catch (error) {
-        console.error(error);
-    }
+    const lines = await loginShell.loadAliases();
+    lines.map(parseAlias).forEach(parsed => aliasesFromConfig[parsed.name] = parsed.value);
 }
 
 export function parseAlias(line: string) {

diff --git a/src/utils/Shell.ts b/src/utils/Shell.ts
@@ -3,6 +3,7 @@ import {readFileSync, statSync} from "fs";
 import * as Path from "path";
 import {EOL} from "os";
 import {resolveFile, io, filterAsync, homeDirectory} from "./Common";
+import {executeCommandWithShellConfig} from "../PTY";
 import * as _ from "lodash";
 
 abstract class Shell {
@@ -11,6 +12,7 @@ abstract class Shell {
     abstract get noConfigSwitches(): string[];
     abstract get preCommandModifiers(): string[];
     abstract get historyFileName(): string;
+    abstract loadAliases(): Promise<string[]>;
 
     async existingConfigFiles(): Promise<string[]> {
         const resolvedConfigFiles = this.configFiles.map(fileName => resolveFile(process.env.HOME, fileName));
@@ -33,7 +35,13 @@ abstract class Shell {
     }
 }
 
-class Bash extends Shell {
+abstract class UnixShell extends Shell {
+    loadAliases() {
+        return executeCommandWithShellConfig("alias");
+    }
+}
+
+class Bash extends UnixShell {
     get executableName() {
         return "bash";
     }
@@ -65,7 +73,7 @@ class Bash extends Shell {
     }
 }
 
-class ZSH extends Shell {
+class ZSH extends UnixShell {
     get executableName() {
         return "zsh";
     }
@@ -126,6 +134,10 @@ class Cmd extends Shell {
     get historyFileName(): string {
         return "";
     }
+
+    async loadAliases() {
+        return [];
+    }
 }
 
 const supportedShells: Dictionary<Shell> = {

diff --git a/tsconfig.json b/tsconfig.json
@@ -6,12 +6,15 @@
     "preserveConstEnums": true,
     "moduleResolution": "node",
     "experimentalDecorators": true,
+    "noImplicitAny": true,
     "noEmitOnError": true,
     "jsx": "react",
     "outDir": "compiled/src",
+    "strictNullChecks": true,
     "noImplicitThis": true,
-    "inlineSourceMap": true
-
+    "inlineSourceMap": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true
   },
   "exclude": [
     "node_modules",