revert: rollback default shell resolver

google · Mar 15, 2022 · da2af58 · da2af58
1 parent 9e609c1
commit da2af58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/index.mjs b/src/index.mjs
@@ -130,6 +130,11 @@ $.quote = quote
 $.spawn = spawn
 $.verbose = true
 $.prefix = '' // Bash not found, no prefix.
+try {
+  $.shell = which.sync('bash')
+  $.prefix = 'set -euo pipefail;'
+} catch (e) {
+}
 
 export function cd(path) {
   if ($.verbose) console.log('$', colorize(`cd ${path}`))

diff --git a/zx.mjs b/zx.mjs
@@ -28,12 +28,6 @@ await async function main() {
   $.verbose = !argv.quiet
   if (typeof argv.shell === 'string') {
     $.shell = argv.shell
-  } else {
-    try {
-      $.shell = which.sync('bash')
-      $.prefix = 'set -euo pipefail;'
-    } catch (e) {
-    }
   }
   if (typeof argv.prefix === 'string') {
     $.prefix = argv.prefix