Merged revisions 85059 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85059 | ronald.oussoren | 2010-09-28 15:57:58 +0200 (Tue, 28 Sep 2010) | 5 lines

  Add support for the ZSH shell to the "Update Shell Profile" script
  on MacOSX.

  Patch by Sylvain Mora, issue #9701.
........

diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile
index cbf41629af0d07f432d4e4b13b0d2d4b9ac7f657..36d0a3e40e4bb33f4a1c890f4542e134d8ef099e 100755 (executable)
--- 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 8d41ef3221b7ec2ebd3ed1345bff7326e98a22e1..e761f2aad17ce6bf56f80808ce240d546af12a55 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -605,6 +605,10 @@ Build
   variable anymore.  It also forwards the LDFLAGS settings to the linker
   when building a shared library.
 
+- 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.
+
 Tests
 -----