railsware#800: execute commands in a cross-platform way

ForNeVeR · May 24, 2017 · 060ce75 · 060ce75
1 parent 2cf7a4d
commit 060ce75
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/src/PTY.ts b/src/PTY.ts
@@ -91,5 +91,5 @@ export async function linedOutputOf(command: string, args: string[], directory:
 export async function executeCommandWithShellConfig(command: string): Promise<string[]> {
     const sourceCommands = (await loginShell.existingConfigFiles()).map(fileName => `source ${fileName} &> /dev/null`);
 
-    return await linedOutputOf(loginShell.executableName, ["/c", `"${[...sourceCommands, command].join(" && ")}"`], process.env.HOME);
+    return await linedOutputOf(loginShell.executableName, [...loginShell.interactiveCommandSwitches, loginShell.combineCommands([...sourceCommands, command])], process.env.HOME);
 }
diff --git a/src/utils/Shell.ts b/src/utils/Shell.ts
@@ -10,12 +10,15 @@ abstract class Shell {
     abstract get executableName(): string;
     abstract get configFiles(): string[];
     abstract get noConfigSwitches(): string[];
-    abstract get commandSwitches(): string[];
+    abstract get executeCommandSwitches(): string[];
+    abstract get interactiveCommandSwitches(): string[];
     abstract get preCommandModifiers(): string[];
     abstract get historyFileName(): string;
     abstract get commandExecutorPath(): string;
     abstract loadAliases(): Promise<string[]>;
 
+    abstract combineCommands(commands: string[]): string;
+
     async existingConfigFiles(): Promise<string[]> {
         const resolvedConfigFiles = this.configFiles.map(fileName => resolveFile(process.env.HOME, fileName));
         return await filterAsync(resolvedConfigFiles, io.fileExists);
@@ -38,7 +41,11 @@ abstract class Shell {
 }
 
 abstract class UnixShell extends Shell {
-    get commandSwitches() {
+    get executeCommandSwitches() {
+        return ["-c"];
+    }
+
+    get interactiveCommandSwitches() {
         return ["-i", "-c"];
     }
 
@@ -49,6 +56,10 @@ abstract class UnixShell extends Shell {
     loadAliases() {
         return executeCommandWithShellConfig("alias");
     }
+
+    combineCommands(commands: string[]) {
+        return `'${commands.join("; ")}'`;
+    }
 }
 
 class Bash extends UnixShell {
@@ -137,8 +148,12 @@ class Cmd extends Shell {
         ];
     }
 
-    get commandSwitches() {
-        return ["/c"];
+    get executeCommandSwitches() {
+        return ["-c"];
+    }
+
+    get interactiveCommandSwitches() {
+        return ["-c"];
     }
 
     get noConfigSwitches() {
@@ -157,6 +172,10 @@ class Cmd extends Shell {
         return Cmd.cmdPath;
     }
 
+    combineCommands(commands: string[]) {
+        return `"${commands.join(" && ")}`;
+    }
+
     async loadAliases() {
         return [];
     }