X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=55a45aecb1dad37e8fac1907a1fa1dc5351a1915;hb=798d51d4a8fedfdaf55305f64c97ce0aa31c5ad3;hp=c79713379b4b2d30fce7f4d8d073acc288bc9f72;hpb=8581b6c87895dcc6445a270f42bdc9483ff28ed2;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index c7971337..55a45aec 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -14,6 +14,7 @@ if [ $? -eq 0 ]; then fi if [ -z "$skip_all" ]; then + if [ ! -z "$SHELL_DEBUG" ]; then echo function definitions begin... fi @@ -62,7 +63,7 @@ if [ -z "$skip_all" ]; then fi } - # checks the result of the last command that was run, and if it failed, + # checks the result of the last command that was run, and if that failed, # then this complains and exits from bash. the function parameters are # used as the message to print as a complaint. function check_result() @@ -98,9 +99,6 @@ if [ -z "$skip_all" ]; then # we 'type' the file to get rid of the unicode result from wmic. cmd $flag type "$tmppid" >$PID_DUMP \rm "$tmppid" -# local CR=' -#' # embedded carriage return. -# local appropriate_pattern="s/^.* *\([0-9][0-9]*\)[ $CR]*\$/\1/p" local appropriate_pattern="s/^.* *\([0-9][0-9]*\) *\$/\1/p" for i in "${patterns[@]}"; do PIDS_SOUGHT+=($(cat $PID_DUMP \ @@ -346,7 +344,7 @@ if [ -z "$skip_all" ]; then # fi if [ -d "$FEISTY_MEOW_DIR/customizing/$user/scripts" ]; then echo "copying custom scripts for $user" - cp -v -R "$FEISTY_MEOW_DIR/customizing/$user/scripts" "$FEISTY_MEOW_GENERATED/custom/" + cp -R "$FEISTY_MEOW_DIR/customizing/$user/scripts" "$FEISTY_MEOW_GENERATED/custom/" fi echo regenerate