From 10e29412af383c1d23c5eec765439d5b89baed68 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Thu, 12 Feb 2009 16:09:09 +0000 Subject: Merged revisions 69544 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r69544 | ronald.oussoren | 2009-02-12 17:08:14 +0100 (Thu, 12 Feb 2009) | 2 lines Fix for issue5224 ("Update Shell Profile.command" contains wrong Python version on OSX) ........ --- Mac/BuildScript/build-installer.py | 3 +-- Mac/BuildScript/scripts/postflight.patch-profile | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index dd606d9..aa38cf1 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -1033,8 +1033,7 @@ def main(): buildPythonDocs() fn = os.path.join(WORKDIR, "_root", "Applications", "Python %s"%(getVersion(),), "Update Shell Profile.command") - patchFile("scripts/postflight.patch-profile", fn) - os.chmod(fn, 0755) + patchScript("scripts/postflight.patch-profile", fn) folder = os.path.join(WORKDIR, "_root", "Applications", "Python %s"%( getVersion(),)) diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile index 5e82f33..4a998c8 100755 --- a/Mac/BuildScript/scripts/postflight.patch-profile +++ b/Mac/BuildScript/scripts/postflight.patch-profile @@ -5,8 +5,8 @@ echo "of python is not early enough of the PATH of your shell." echo "These changes will be effective only in shell windows that you open" echo "after running this script." -PYVER=2.5 -PYTHON_ROOT="/Library/Frameworks/Python.framework/Versions/Current" +PYVER=@PYVER@ +PYTHON_ROOT="/Library/Frameworks/Python.framework/Versions/@PYVER@" if [ `id -ur` = 0 ]; then # Run from the installer, do some trickery to fetch the information -- cgit v0.12