X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fcore%2Ffunctions.sh;h=1a061797c6f20175b84dbff3b9129a4bd0f02ca6;hb=6271d07b36fa81d2c928febe24eccd0495396886;hp=b477db18de989195e0ed8c6afefc2357cbde4837;hpb=bf852afd5e38f209ff2d13d109d60caccd41be27;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index b477db18..1a061797 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -165,12 +165,18 @@ if [ -z "$skip_all" ]; then function ssh() { local args=($*) - save_terminal_title # we remember the old terminal title, then force the TERM variable to a more generic # version for the other side (just 'linux'); we don't want the remote side still # thinking it's running xterm. - export TERM=linux + save_terminal_title +#hmmm: why were we doing this? it scorches the user's logged in session, leaving it without proper terminal handling. +# # we save the value of TERM; we don't want to leave the user's terminal +# # brain dead once we come back from this function. +# local oldterm="$TERM" +# export TERM=linux /usr/bin/ssh -X -C "${args[@]}" +# # restore the terminal variable also. +# TERM="$oldterm" restore_terminal_title } @@ -470,6 +476,10 @@ if [ -z "$skip_all" ]; then echo "but that folder does not exist. Skipping customization." return 1 fi + + # prevent permission foul-ups. + chown -R "$(logname):$(logname)" "$FEISTY_MEOW_LOADING_DOCK" "$FEISTY_MEOW_GENERATED_STORE" + regenerate >/dev/null pushd "$FEISTY_MEOW_LOADING_DOCK/custom" &>/dev/null incongruous_files="$(bash "$FEISTY_MEOW_SCRIPTS/files/list_non_dupes.sh" "$FEISTY_MEOW_SCRIPTS/customize/$custom_user" "$FEISTY_MEOW_LOADING_DOCK/custom")" @@ -499,6 +509,9 @@ if [ -z "$skip_all" ]; then echo regenerate + # prevent permission foul-ups, again. + chown -R "$(logname):$(logname)" "$FEISTY_MEOW_LOADING_DOCK" "$FEISTY_MEOW_GENERATED_STORE" + restore_terminal_title }