fully functional death star

[feisty_meow.git] / scripts / core / functions.sh

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 24b162ef49d6471f60bafccada97366a745420ba..a81383e29c9e01e9a77a64e8e98d823896fc49a2 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -422,30 +422,30 @@ if [ -z "$skip_all" ]; then
     fi
   }
   
-  # su function: makes su perform a login.
-  # for some OSes, this transfers the X authority information to the new login.
-  function su() {
-    if debian_like; then
-      # debian currently requires the full version which imports X authority
-      # information for su.
-  
-      # get the x authority info for our current user.
-      source "$FEISTY_MEOW_SCRIPTS/security/get_x_auth.sh"
-  
-      if [ -z "$X_auth_info" ]; then
-        # if there's no authentication info to pass along, we just do a normal su.
-        /bin/su -l $*
-      else
-        # under X, we update the new login's authority info with the previous
-        # user's info.
-        (unset XAUTHORITY; /bin/su -l $* -c "$X_auth_info ; export DISPLAY=$DISPLAY ; bash")
-      fi
-    else
-      # non-debian supposedly doesn't need the extra overhead any more.
-      # or at least suse doesn't, which is the other one we've tested on.
-      /bin/su -l $*
-    fi
-  }
+#bork  # su function: makes su perform a login.
+#bork  # for some OSes, this transfers the X authority information to the new login.
+#bork  function su() {
+#bork    if debian_like; then
+#bork      # debian currently requires the full version which imports X authority
+#bork      # information for su.
+#bork  
+#bork      # get the x authority info for our current user.
+#bork      source "$FEISTY_MEOW_SCRIPTS/security/get_x_auth.sh"
+#bork  
+#bork      if [ -z "$X_auth_info" ]; then
+#bork        # if there's no authentication info to pass along, we just do a normal su.
+#bork        /bin/su -l $*
+#bork      else
+#bork        # under X, we update the new login's authority info with the previous
+#bork        # user's info.
+#bork        (unset XAUTHORITY; /bin/su -l $* -c "$X_auth_info ; export DISPLAY=$DISPLAY ; bash")
+#bork      fi
+#bork    else
+#bork      # non-debian supposedly doesn't need the extra overhead any more.
+#bork      # or at least suse doesn't, which is the other one we've tested on.
+#bork      /bin/su -l $*
+#bork    fi
+#bork  }
   
   # this function wraps the normal sudo by ensuring we replace the terminal
   # label before we launch what they're passing to sudo.  we also ensure that
@@ -460,23 +460,25 @@ if [ -z "$skip_all" ]; then
     if [ ! -z "$DISPLAY" ]; then
       export IMPORTED_XAUTH="$(xauth list $DISPLAY | head -n 1 | awk '{print $3}')"
     fi
-    # prep a simple string here, rather than messing with arguments in the
-    # already complicated command below.
+    # prep a simple command string here, rather than messing with arguments
+    # in the already complicated command below.  i was seeing some really
+    # screwy behavior trying to expand $@ when embedded for the bash -c flag,
+    # but making the variable ahead of time gets rid of that.
     cmd="/usr/bin/sudo ""$@"
 
     # omit any variables that are either wrong for a different user or used
     # to shield the feisty meow scripts from reconfiguring.  when we do the
-    # sudo, we want a fresh start for feisty meow at least.  this approach
-    # is complicated by our sentinel alias, which normally is passed to any
-    # subshells.
+    # sudo, we want a fresh start for feisty meow at least.
+    # our approach to launching sudo is further complicated by our sentinel
+    # alias, which normally is passed to any subshells (to prevent recreating
+    # aliases).  we turn off the expand_aliases shell option to avoid passing
+    # the sentinel, which ensures aliases do get recreated for the new user.
     BUILD_VARS_LOADED= \
     CORE_VARIABLES_LOADED= \
     FEISTY_MEOW_SCRIPTS_LOADED= \
     function_sentinel= \
     MAIL= \
     bash +O expand_aliases -c "$cmd"
-      # the above does cause an extra shell, but we need it to work
-      # identically to the normal sudo syntax, and that gets us this.
     retval=$?
     restore_terminal_title
     return $retval