From 9af738022ee36bd577f1decd181e8a8911691a7b Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 28 Sep 2010 13:57:58 +0000
Subject: [PATCH] Add support for the ZSH shell to the "Update Shell Profile"
 script on MacOSX.

Patch by Sylvain Mora, issue #9701.
---
 Mac/BuildScript/scripts/postflight.patch-profile | 5 ++++-
 Misc/NEWS                                        | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile
index cbf41629af0..36d0a3e40e4 100755
--- a/Mac/BuildScript/scripts/postflight.patch-profile
+++ b/Mac/BuildScript/scripts/postflight.patch-profile
@@ -20,7 +20,7 @@ fi
 # Make sure the directory ${PYTHON_ROOT}/bin is on the users PATH.
 BSH="`basename "${theShell}"`"
 case "${BSH}" in
-bash|ksh|sh|*csh)
+bash|ksh|sh|*csh|zsh)
 	if [ `id -ur` = 0 ]; then
 		P=`su - ${USER} -c 'echo A-X-4-X@@$PATH@@X-4-X-A' | grep 'A-X-4-X@@.*@@X-4-X-A' | sed -e 's/^A-X-4-X@@//g' -e 's/@@X-4-X-A$//g'`
 	else
@@ -76,6 +76,9 @@ bash)
 		PR="${HOME}/.bash_profile"
 	fi
 	;;
+zsh)
+        PR="${HOME}/.zprofile"
+        ;;
 *sh)
 	PR="${HOME}/.profile"
 	;;
diff --git a/Misc/NEWS b/Misc/NEWS
index beedb0c4cc0..dfabd85d195 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -286,6 +286,10 @@ Build
 - Issue #4026: Make the fcntl extension build under AIX.  Patch by Sébastien
   Sablé.
 
+- Issue #9701: The MacOSX installer can patch the shell profile to ensure that
+  the "bin" directory inside the framework is on the shell's search path. This
+  feature now also supports the ZSH shell.
+
 
 What's New in Python 3.2 Alpha 2?
 =================================