become overhaul.

[profile.git] / opt / bin / become

diff --git a/opt/bin/become b/opt/bin/become
index add9600..f7f037e 100755 (executable)
--- a/opt/bin/become
+++ b/opt/bin/become
@@ -1,14 +1,40 @@
 #!/bin/bash
 
-user="$1"
+user="$1"; shift
 if [ -z "$user" ]; then
   echo >&2 "Usage: become <user>"
   exit 1
 fi
 
 PRINCIPAL=$(klist 2>/dev/null | sed -n 's/^Default principal: //p')
+if [ -n "$DISPLAY" -a "${DISPLAY##localhost:}" = "$DISPLAY" ]; then
+  COOKIE="$(xauth list $DISPLAY)"
+fi
 BECOME="$HOME/.become"
 profile="$BECOME/$user"
 [ -f "$profile" ] || profile="$BECOME/all"
 
-exec sudo -H -u "$user" env BECOME_HOME="$HOME" PRINCIPAL=$PRINCIPAL /bin/bash --rcfile "$profile"
+file="$(mktemp)"
+if [ -n "$file" ]; then
+  exec 3>"$file"
+  exec <"$file"
+  rm "$file"
+
+  echo >&3 "cd"
+  echo >&3 "PROFILE_HOME='$HOME'"
+  [ -n "$PRINCIPAL" ] && echo >&3 "PRINCIPAL='$PRINCIPAL'"
+  if [ -n "$DISPLAY" -a -n "$COOKIE" ]; then
+    echo >&3 "xauth add $COOKIE"
+  else
+    echo >&3 "unset DISPLAY"
+  fi
+
+  echo >&3 2>/dev/null ". $HOME/.bash_profile"
+  [ -f "$BECOME/all" ] && cat >&3 2>/dev/null "$BECOME/all"
+  [ -f "$BECOME/$user" ] && cat >&3 2>/dev/null "$BECOME/$user"
+fi
+
+dir=$(dirname "$0")
+[ "$dir" = "." ] && dir="$PWD"
+exec sudo -H -u "$user" "$dir/became"
+exit 111