summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-09-28 14:01:49 +0000
committerRonald Oussoren <ronaldoussoren@mac.com>2010-09-28 14:01:49 +0000
commitec2fe0063943b810e5a1b41282e79c49597637a0 (patch)
tree6c84f6db1c19c63ec1255ff5663b94d2438b3d83
parent3b47b6c04ca2b2d3a4c02f05e6406c7a07c51b84 (diff)
downloadcpython-git-ec2fe0063943b810e5a1b41282e79c49597637a0.tar.gz
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. ........
-rwxr-xr-xMac/BuildScript/scripts/postflight.patch-profile5
-rw-r--r--Misc/NEWS5
2 files changed, 9 insertions, 1 deletions
diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile
index d9ff328478..a66b8c787a 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 33dc1f15a4..083fc530d4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -377,6 +377,11 @@ Build
of the ``2to3`` tool, that is you can use ``2to3-2.7`` to select the Python
2.7 edition of 2to3.
+- 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
-----