X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=a5cd8b41f0aadc9c932abad09726faf5442be2b2;hb=1991dc82396dc856df2e668e5b2cdd08be1fbcb7;hp=a58e818fd5000bee4172a7fcf0f955e8d76d0656;hpb=21f30bb859e6c15393e23ac0e5ef417b82f628a5;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index a58e818f..a5cd8b41 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -187,20 +187,18 @@ 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 - if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then - echo TERM saved is: $PRIOR_TERMINAL_TITLE - fi + #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" - if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then - echo TERM before restore, will use prior title of: $PRIOR_TERMINAL_TITLE - fi + restore_terminal_title if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo TERM title restored to prior value @@ -712,48 +710,48 @@ or if you're on cygwin, then try this (if apt-cyg is available):\n popd &>/dev/null } - function spacem() - { - while [ $# -gt 0 ]; do - arg="$1"; shift - if [ ! -f "$arg" -a ! -d "$arg" ]; then - echo "=> did not find a file or directory named '$arg'." - continue - fi - - # first we will capture the output of the character replacement operation for reporting. - # this is done first since some filenames can't be properly renamed in perl (e.g. if they - # have pipe characters apparently). - intermediate_name="$(bash "$FEISTY_MEOW_SCRIPTS/files/replace_spaces_with_underscores.sh" "$arg")" - local saw_intermediate_result=0 - if [ -z "$intermediate_name" ]; then - # make sure we report something, if there are no further name changes. - intermediate_name="'$arg'" - else - # now zap the first part of the name off (since original name isn't needed). - intermediate_name="$(echo $intermediate_name | sed -e 's/.*=> //')" - saw_intermediate_result=1 - fi - - # first we rename the file to be lower case. - actual_file="$(echo $intermediate_name | sed -e "s/'\([^']*\)'/\1/")" - final_name="$(perl $FEISTY_MEOW_SCRIPTS/files/renlower.pl "$actual_file")" - local saw_final_result=0 - if [ -z "$final_name" ]; then - final_name="$intermediate_name" - else - final_name="$(echo $final_name | sed -e 's/.*=> //')" - saw_final_result=1 - fi -#echo intermed=$saw_intermediate_result -#echo final=$saw_final_result - - if [[ $saw_intermediate_result != 0 || $saw_final_result != 0 ]]; then - # printout the combined operation results. - echo "'$arg' => $final_name" - fi - done - } +# function spacem() +# { +# while [ $# -gt 0 ]; do +# arg="$1"; shift +# if [ ! -f "$arg" -a ! -d "$arg" ]; then +# echo "=> did not find a file or directory named '$arg'." +# continue +# fi +# +# # first we will capture the output of the character replacement operation for reporting. +# # this is done first since some filenames can't be properly renamed in perl (e.g. if they +# # have pipe characters apparently). +# intermediate_name="$(bash "$FEISTY_MEOW_SCRIPTS/files/replace_spaces_with_underscores.sh" "$arg")" +# local saw_intermediate_result=0 +# if [ -z "$intermediate_name" ]; then +# # make sure we report something, if there are no further name changes. +# intermediate_name="'$arg'" +# else +# # now zap the first part of the name off (since original name isn't needed). +# intermediate_name="$(echo $intermediate_name | sed -e 's/.*=> //')" +# saw_intermediate_result=1 +# fi +# +# # first we rename the file to be lower case. +# actual_file="$(echo $intermediate_name | sed -e "s/'\([^']*\)'/\1/")" +# final_name="$(perl $FEISTY_MEOW_SCRIPTS/files/renlower.pl "$actual_file")" +# local saw_final_result=0 +# if [ -z "$final_name" ]; then +# final_name="$intermediate_name" +# else +# final_name="$(echo $final_name | sed -e 's/.*=> //')" +# saw_final_result=1 +# fi +##echo intermed=$saw_intermediate_result +##echo final=$saw_final_result +# +# if [[ $saw_intermediate_result != 0 || $saw_final_result != 0 ]]; then +# # printout the combined operation results. +# echo "'$arg' => $final_name" +# fi +# done +# } ##############