fix: Skip completion install for win32 platform or unknown shell

mklabs · May 9, 2016 · c4f6073 · c4f6073
1 parent 0393087
commit c4f6073
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/commands/index.js b/lib/commands/index.js
@@ -39,6 +39,17 @@ export default class Commands {
   install(options) {
     options = options || {};
     var script = this.complete.script(this.name, this.name || 'tabtab');
+
+    if (process.platform === 'win32') {
+      return debug('Windows shell completion not yet supported, skipping completion install');
+    }
+
+    var shell = process.env.SHELL;
+    if (shell) shell = shell.split('/').slice(-1)[0];
+    if (!this.installer[shell]) {
+      return debug('User shell %s not supported, skipping completion install', shell);
+    }
+
     this.installer
       .handle(this.options.name || this.complete.resolve('name'), options)
       .catch((e) => {

diff --git a/lib/installer.js b/lib/installer.js
@@ -162,10 +162,6 @@ export default class Installer {
     return new Promise((r, errback) => {
       var shell = process.env.SHELL;
       if (shell) shell = shell.split('/').slice(-1)[0];
-      if (!this[shell]) {
-        debug('User shell %s not supported', shell);
-        return errback(new Error('Shell not supported: ' + shell));
-      }
 
       return this[shell]().then(r)
         .catch(errback);