Prefer the default shell to zsh

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