X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=opt%2Fbin%2Fbecome;h=d95864686a727451d8f088ab52cd0098951e5689;hb=f5b8391f53a507d628509bcb0ff54c16dc275c0a;hp=0825bd68c65e1b02f5137a01dff8938300d465aa;hpb=955e5e8e0c9442e99c3d67ea79afe77a0833d42a;p=profile.git

diff --git a/opt/bin/become b/opt/bin/become
index 0825bd6..d958646 100755
--- a/opt/bin/become
+++ b/opt/bin/become
@@ -37,9 +37,27 @@ PRINCIPAL=$(klist 2>/dev/null | sed -n 's/^Default principal: //p')
 if [ $x11 = 1 -a -n "$DISPLAY" -a "${DISPLAY##localhost:}" = "$DISPLAY" ]; then
   COOKIE="$(xauth list $DISPLAY)"
 fi
-BECOME="$HOME/.become"
-profile="$BECOME/$user"
-[ -f "$profile" ] || profile="$BECOME/all"
+ignore_profile_user=0
+for candidate in "$HOME" "$PROFILE_HOME"; do
+  [ -n "$candidate" ] || continue
+  BECOME="$candidate/.become"
+  [ -d "$BECOME" ] || continue
+
+  # Script to run when becoming any user.
+  [ -z "$allusersprofile" ] && allusersprofile="$BECOME/all"
+  [ -f "$allusersprofile" ] || allusersprofile=
+
+  # Set $HOME/all sticky to ignore $PROFILE_HOME/$user.
+  if [ "$candidate" = "$HOME" ]; then
+    [ -k "$BECOME/all" ] && ignore_profile_user=1
+  else
+    [ $ignore_profile_user = 1 ] && continue
+  fi
+
+  # Script to run (after the one mentioned above) when becoming this user.
+  [ -z "$userprofile" ] && userprofile="$BECOME/$user"
+  [ -f "$userprofile" ] || userprofile=
+done
 
 file="${TMPDIR:-/tmp}/$USER.become.$user.$RANDOM.$$"
 umask=$(builtin umask -p)
@@ -47,7 +65,7 @@ builtin umask 077
 if exec 3>"$file" && exec <"$file" && rm "$file"; then
   builtin $umask
   echo >&3 "cd"
-  echo >&3 "PROFILE_HOME='$HOME'"
+  echo >&3 "PROFILE_HOME='${PROFILE_HOME:-$HOME}'"
   if [ -n "$PRINCIPAL" ]; then
     echo >&3 "PRINCIPAL='$PRINCIPAL'"
     if [ $kerberos = 1 ]; then
@@ -67,13 +85,16 @@ if exec 3>"$file" && exec <"$file" && rm "$file"; then
   else
     echo >&3 "unset DISPLAY"
   fi
+  if [ ! "$PROFILE_HOME" = "$HOME" ]; then
+    echo >&3 "export SCREENRC=$PROFILE_HOME/.screenrc"
+  fi
 else
   exit 111
 fi
 
-echo >&3 ". $HOME/.bash_profile"
-[ -f "$BECOME/all" ] && cat >&3 2>/dev/null "$BECOME/all"
-[ -f "$BECOME/$user" ] && cat >&3 2>/dev/null "$BECOME/$user"
+echo >&3 ". ${PROFILE_HOME:-$HOME}/.bash_profile"
+[ -f "$allusersprofile" ] && cat >&3 2>/dev/null "$allusersprofile"
+[ -f "$userprofile" ] && cat >&3 2>/dev/null "$userprofile"
 [ $chdir = 1 ] && echo >&3 2>/dev/null "cd - &>/dev/null"
 
 exec 3>&-