- # 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.
- # 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"
+
+ # launch sudo with just the variables we want to reach the other side.
+ local varmods=
+# varmods+="PATH= "
+ if [ ! -z "$IMPORTED_XAUTH" ]; then varmods+="IMPORTED_XAUTH=$IMPORTED_XAUTH "; fi
+ if [ ! -z "$SSH_AUTH_SOCK" ]; then varmods+="SSH_AUTH_SOCK=$SSH_AUTH_SOCK"; fi
+ /usr/bin/sudo $varmods "$@"