From 78b87b7f2372dae4cf4af362b528b6cc2a263f91 Mon Sep 17 00:00:00 2001
From: EricFromCanada <enk3@outlook.com>
Date: Thu, 23 Apr 2020 00:38:36 -0400
Subject: [PATCH] sh: fix custom shell prompt for zsh

---
 Library/Homebrew/dev-cmd/sh.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/sh.rb b/Library/Homebrew/dev-cmd/sh.rb
index 43efcb5735..fc8a8117de 100644
--- a/Library/Homebrew/dev-cmd/sh.rb
+++ b/Library/Homebrew/dev-cmd/sh.rb
@@ -40,10 +40,10 @@ module Homebrew
       # superenv stopped adding brew's bin but generally users will want it
       ENV["PATH"] = PATH.new(ENV["PATH"]).insert(1, HOMEBREW_PREFIX/"bin")
     end
-    ENV["PS1"] = if ENV["SHELL"].include?("zsh")
-      "brew %B%F{green}~%f%b$ "
+    subshell = if ENV["SHELL"].include?("zsh")
+      "PS1='brew %B%F{green}%~%f%b$ ' #{ENV["SHELL"]} -d"
     else
-      'brew \[\033[1;32m\]\w\[\033[0m\]$ '
+      "PS1=\"brew \\[\\033[1;32m\\]\\w\\[\\033[0m\\]$ \" #{ENV["SHELL"]}"
     end
     ENV["VERBOSE"] = "1"
     puts <<~EOS
@@ -55,6 +55,6 @@ module Homebrew
       When done, type `exit`.
     EOS
     $stdout.flush
-    safe_system ENV["SHELL"]
+    safe_system subshell
   end
 end