Fix for issue5224 ("Update Shell Profile.command" contains wrong Python version on...

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index dd606d947faaf845d1eafec87ceecba23bd8d0f2..aa38cf17bdc151863a2cd5c9df8a7b916b96f2fb 100755 (executable)
--- 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 5e82f331cfa32a83015a8216f1f3e71cfdc489bc..4a998c8c3c02eb9e6f3fb2c39f165ce313ee16a1 100755 (executable)
--- 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