From 478b2a816741ba2d6504944d35f73aeb4c84b446 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Tue, 28 Sep 2010 14:04:41 +0000 Subject: [PATCH] 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. ........ --- 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 8d41ef3221b..e761f2aad17 100644 --- 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 -----