diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-02-12 16:08:14 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-02-12 16:08:14 +0000 |
| commit | bc448664af5add9f76400c1a8aee0e4324bc609b (patch) | |
| tree | 986b8c4fa7fcaf6f7a06dd9476e11b3f44262822 | |
| parent | 9e35004509f3744a6ee51e89540b8ff41d0d73c9 (diff) | |
| download | cpython-git-bc448664af5add9f76400c1a8aee0e4324bc609b.tar.gz | |
Fix for issue5224 ("Update Shell Profile.command" contains wrong Python version on OSX)
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 3 | ||||
| -rwxr-xr-x | 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 dd606d947f..aa38cf17bd 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 5e82f331cf..4a998c8c3c 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 |