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.
........
This commit is contained in:
Ronald Oussoren 2010-09-28 14:04:41 +00:00
parent 805ddaa3da
commit 478b2a8167
2 changed files with 8 additions and 1 deletions

View File

@ -20,7 +20,7 @@ fi
# Make sure the directory ${PYTHON_ROOT}/bin is on the users PATH. # Make sure the directory ${PYTHON_ROOT}/bin is on the users PATH.
BSH="`basename "${theShell}"`" BSH="`basename "${theShell}"`"
case "${BSH}" in case "${BSH}" in
bash|ksh|sh|*csh) bash|ksh|sh|*csh|zsh)
if [ `id -ur` = 0 ]; then 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'` 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 else
@ -76,6 +76,9 @@ bash)
PR="${HOME}/.bash_profile" PR="${HOME}/.bash_profile"
fi fi
;; ;;
zsh)
PR="${HOME}/.zprofile"
;;
*sh) *sh)
PR="${HOME}/.profile" PR="${HOME}/.profile"
;; ;;

View File

@ -605,6 +605,10 @@ Build
variable anymore. It also forwards the LDFLAGS settings to the linker variable anymore. It also forwards the LDFLAGS settings to the linker
when building a shared library. 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 Tests
----- -----