mercurywm: add alias command (#55)

* mercurywm: add alias command * mercurywm: add error messages to alias and env
wheel-org · Jan 24, 2019 · b65d6e4 · b65d6e4
1 parent eda9909
commit b65d6e4
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/src/background/commands/alias.js b/src/background/commands/alias.js
@@ -0,0 +1,31 @@
+/* @flow strict */
+
+import type { StoreState } from 'types';
+
+/* This command has essentially the same logic as env.js */
+export default function alias(state: StoreState, params: Array<string>) {
+  if (!state.wsh.aliases) {
+      state.wsh.aliases = {};
+  }
+  if (params.length === 0) {
+    Object.keys(state.wsh.aliases).forEach(e => {
+        this.output(e + ': ' + state.wsh.aliases[e], false, false);
+    });
+  } else if (params.length === 1) {
+    if (!state.wsh.aliases[params[0]]) {
+      this.output('\'' + params[0] + '\' is not aliased to anything!');
+    } else {
+      this.output(params[0] + ': ' + state.wsh.aliases[params[0]], false, false);
+    }
+  } else if (params.length === 2) {
+    // $FlowFixMe: command can mutate state
+    if (!params[1]) {
+      delete state.wsh.aliases[params[0]];
+    } else {
+      state.wsh.aliases[params[0]] = params[1];
+    }
+  } else {
+    this.output('Invalid number of parameters');
+  }
+  return state;
+}
diff --git a/src/background/commands/env.js b/src/background/commands/env.js
@@ -8,7 +8,11 @@ export default function env(state: StoreState, params: Array<string>) {
       this.output(e + ': ' + state.wsh.env[e], false, false);
     });
   } else if (params.length === 1) {
-    this.output(params[0] + ': ' + state.wsh.env[params[0]], false, false);
+    if (!state.wsh.env[params[0]]) {
+      this.output('Environment variable \'' + params[0] + '\' does not exist!');
+    } else {
+      this.output(params[0] + ': ' + state.wsh.env[params[0]], false, false);
+    }
   } else if (params.length === 2) {
     // $FlowFixMe: command can mutate state
     state.wsh.env[params[0]] = params[1];

diff --git a/src/background/commands/index.js b/src/background/commands/index.js
@@ -64,6 +64,7 @@ function Command(state, command, params) {
 
 export function isCommand(name: string) {
     const names = [
+        'alias',
         'cat',
         'cd',
         'clear',
@@ -87,7 +88,12 @@ export function isCommand(name: string) {
 export function executeCommand(state: StoreState, input: string): StoreState {
     if (input === '') return state;
 
-    const [name, ...params] = parseInput(input);
+    let [name, ...params] = parseInput(input);
+    while (state.wsh.aliases && state.wsh.aliases[name]) {
+        const [newName, ...newParams] = parseInput(state.wsh.aliases[name]);
+        name = newName;
+        params.unshift(...newParams);
+    }
 
     const command = new Command(state, name, params);
     if (name === 'reset') {