# local oldterm="$TERM"
# export TERM=linux
- /usr/bin/ssh -X -C "${args[@]}"
+ /usr/bin/ssh -Y -C "${args[@]}"
# # restore the terminal variable also.
# TERM="$oldterm"
done
}
-#hmmm: not really doing anything yet; ubuntu seems to have changed from pulseaudio in 17.04?
- # restarts the sound driver.
- function fix_sound_driver() {
- # stop bash complaining about blank function body.
- local nothing=
-#if alsa something
-# sudo service alsasound restart
-#elif pulse something
-# sudo pulseaudio -k
-# sudo pulseaudio -D
-#else
-# something else...?
-#fi
-
- }
-
function screen() {
save_terminal_title
#hmmm: ugly absolute path here.
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
# the feisty meow environment is recreated; normal subshells don't need
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
##############
+ # you have hit the borderline functional zone...
+
+#hmmm: not really doing anything yet; ubuntu seems to have changed from pulseaudio in 17.04?
+ # restarts the sound driver.
+ function fix_sound_driver() {
+ # stop bash complaining about blank function body.
+ local nothing=
+#if alsa something
+# sudo service alsasound restart
+#elif pulse something
+# sudo pulseaudio -k
+# sudo pulseaudio -D
+#else
+# something else...?
+#fi
+
+ }
+
+ # ...and here's the end of the borderline functional zone.
+
+ ##############
+
# NOTE: no more function definitions are allowed after this point.
function function_sentinel()