[Python-checkins] r85061 - in python/branches/release31-maint: Mac/BuildScript/scripts/postflight.patch-profile Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue Sep 28 16:04:41 2010
New Revision: 85061

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Mac/BuildScript/scripts/postflight.patch-profile
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Mac/BuildScript/scripts/postflight.patch-profile
==============================================================================
--- python/branches/release31-maint/Mac/BuildScript/scripts/postflight.patch-profile	(original)
+++ python/branches/release31-maint/Mac/BuildScript/scripts/postflight.patch-profile	Tue Sep 28 16:04:41 2010
@@ -20,7 +20,7 @@
 # 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 @@
 		PR="${HOME}/.bash_profile"
 	fi
 	;;
+zsh)
+        PR="${HOME}/.zprofile"
+        ;;
 *sh)
 	PR="${HOME}/.profile"
 	;;

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Sep 28 16:04:41 2010
@@ -605,6 +605,10 @@
   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
 -----