Changeset 33639

Timestamp:

02/01/2008 23:16:35 (4 years ago)

Author:

jmpp@…

Message:

• Use dscl(1) to detect the default shell for the installing user, rather than trying to infer it from the inherited environment (which did not reflect the user's at all, as it is entirely imposed by Installer.app when the pkg is used in real life). Thanks to Ryan on macports-dev for the original suggestion!

• Provide a little more information about the shell we detected.

NOTE: I tested this edited script through a test pkg on Leopard and it works, both when used from an account with a bash shell and
from one with a tcsh shell. If anyone cares to test on Tiger and/or Panther, they should contact me so I can hand them the pkg, thanks!
In any case, I'm feeling confident it'll work consistently this time round to detect the shell type, given the nature of the dscl operation.

Files:

• branches/release_1_6/base/portmgr/dmg/postflight (modified) (4 diffs)

branches/release_1_6/base/portmgr/dmg/postflight

@@ -85 +85 @@
 # Determine the user's shell, in order to choose an appropriate configuration file we'll be tweaking.
 # Exit nicely if the shell is any other than bash or tcsh, as that's considered non-standard.
-USHELL="$(basename "${SHELL}")" || {
+USHELL=$(dscl . -read /users/${USER} shell | awk -F'/' '{print $NF}') || {
     echo "An attempt to determine your shell name failed! Please set your MacPorts compatible environment manually."
     update_macports
@@ -92 +92 @@
 case "${USHELL}" in
     tcsh)
+        echo "Detected the tcsh shell."
         LOGIN_FLAG=""
         ENV_COMMAND="setenv"
@@ -98 +99 @@
         ;;
     bash)
+        echo "Detected the bash shell."
         LOGIN_FLAG="-l"
         ENV_COMMAND="export"
@@ -104 +106 @@
         ;;
     *)
-        echo "Unknown shell! Please set your MacPorts compatible environment manually."
+        echo "Unknown shell ($USHELL)! Please set your MacPorts compatible environment manually."
         update_macports
         exit 0