fix(fallback): shells were sometimes ignored based on $SHELL

Author: zkat

auto-fallback.js

@@ -26,21 +26,23 @@ function __fish_command_not_found_on_interactive --on-event fish_prompt
   functions --erase __fish_command_not_found_on_interactive
 end`
 
-module.exports = function autoFallback (shell) {
-  const SHELL = process.env.SHELL || ''
-
-  if (shell === 'bash' || SHELL.includes('bash')) {
+module.exports = autoFallback
+function autoFallback (shell, fromEnv) {
+  if (shell.includes('bash')) {
     return POSIX.replace('handler()', 'handle()')
   }
 
-  if (shell === 'zsh' || SHELL.includes('zsh')) {
+  if (shell.includes('zsh')) {
     return POSIX
   }
 
-  if (shell === 'fish' || SHELL.includes('fish')) {
+  if (shell.includes('fish')) {
     return FISH
   }
 
+  if (fromEnv) {
+    return autoFallback(fromEnv)
+  }
+
   console.error('Only Bash, Zsh, and Fish shells are supported :(')
-  process.exit(1)
 }

index.js

@@ -21,8 +21,13 @@ main(parseArgs())
 function main (argv) {
   const shell = argv['shell-auto-fallback']
   if (shell || shell === '') {
-    console.log(autoFallback(shell))
-    process.exit(0)
+    const fallback = autoFallback(shell, process.env.SHELL)
+    if (fallback) {
+      console.log(fallback)
+      process.exit(0)
+    } else {
+      process.exit(1)
+    }
   }
 
   if (!argv.command || !argv.package) {