summaryrefslogtreecommitdiff
path: root/task
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-11-07 15:44:15 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-11-07 16:40:34 +0100
commitca2cf7d494871c141774185d0755911fc574a211 (patch)
treee551a5c333b68549a6086db28f7115b3123d6ec8 /task
parentbc3e0cc537d5a7964a7025bb80b2676b4e7fe234 (diff)
downloadbundler-ca2cf7d494871c141774185d0755911fc574a211.tar.gz
Prefer the default shell to zsh
Diffstat (limited to 'task')
-rw-r--r--task/release.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/task/release.rake b/task/release.rake
index 3a14243263..a39fbba63a 100644
--- a/task/release.rake
+++ b/task/release.rake
@@ -183,7 +183,7 @@ namespace :release do
if commits.any? && !system("git", "cherry-pick", "-x", "-m", "1", *commits.map(&:first))
warn "Opening a new shell to fix the cherry-pick errors"
- unless system("zsh")
+ unless system(ENV["SHELL"] || "zsh")
abort "Failed to resolve conflicts on a different shell. Resolve conflicts manually and finish the task manually"
end
end