X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=1a061797c6f20175b84dbff3b9129a4bd0f02ca6;hb=6271d07b36fa81d2c928febe24eccd0495396886;hp=c078c90afdb1d6feaa3060f8f2e8402af55cb012;hpb=0a2f8110a30ce0dc4936ec6a4585fbbda831a5e5;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index c078c90a..1a061797 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -169,14 +169,15 @@ if [ -z "$skip_all" ]; then # version for the other side (just 'linux'); we don't want the remote side still # thinking it's running xterm. save_terminal_title - # 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 +#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 - # restore the terminal variable also. - TERM="$oldterm" } ############## @@ -475,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")" @@ -504,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 }