Backport of r52238

diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile
index c42e11e31b695541b06932a219b78a710cb21457..5e82f331cfa32a83015a8216f1f3e71cfdc489bc 100755 (executable)
--- a/Mac/BuildScript/scripts/postflight.patch-profile
+++ b/Mac/BuildScript/scripts/postflight.patch-profile
@@ -47,22 +47,29 @@ done
 echo "${PYTHON_ROOT}/bin is not on your PATH or at least not early enough"
 case "${BSH}" in
 *csh)
+       if [ -f "${HOME}/.tcshrc" ]; then
+               RC="${HOME}/.tcshrc"
+       else
+               RC="${HOME}/.cshrc"
+       fi
        # Create backup copy before patching
-       if [ -f "${HOME}/.cshrc" ]; then
-               cp -fp "${HOME}/.cshrc" "${HOME}/.cshrc.pysave"
+       if [ -f "${RC}" ]; then
+               cp -fp "${RC}" "${RC}.pysave"
        fi
-       echo "" >> "${HOME}/.cshrc"
-       echo "# Setting PATH for MacPython ${PYVER}" >> "${HOME}/.cshrc"
-       echo "# The orginal version is saved in .cshrc.pysave" >> "${HOME}/.cshrc"
-       echo "set path=(${PYTHON_ROOT}/bin "'$path'")" >> "${HOME}/.cshrc"
+       echo "" >> "${RC}"
+       echo "# Setting PATH for MacPython ${PYVER}" >> "${RC}"
+       echo "# The orginal version is saved in .cshrc.pysave" >> "${RC}"
+       echo "set path=(${PYTHON_ROOT}/bin "'$path'")" >> "${RC}"
        if [ `id -ur` = 0 ]; then
-               chown "${USER}" "${HOME}/.cshrc"
+               chown "${USER}" "${RC}"
        fi
        exit 0
        ;;
 bash)
        if [ -e "${HOME}/.bash_profile" ]; then
                PR="${HOME}/.bash_profile"
+       elif [ -e "${HOME}/.bash_login" ]; then
+               PR="${HOME}/.bash_login"
        elif [ -e "${HOME}/.profile" ]; then
                PR="${HOME}/.profile"
        else