X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=189dac016546307e7e665e05f816285e4389cbf9;hb=b1773c69c4945fc76a96551245c9c7c16c9a3a2a;hp=dee26d6b4fae1a78dcb624508f631b1653960041;hpb=36f69c61255add8dbac41ebd2100f6b726c6865e;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index dee26d6b..189dac01 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -478,15 +478,22 @@ if [ -z "$skip_all" ]; then fi # prevent permission foul-ups. - chown -R "$(logname):$(logname)" "$FEISTY_MEOW_LOADING_DOCK"/* "$FEISTY_MEOW_GENERATED_STORE"/* +#hmmm: save error output here instead of muting it. +#hmmm: better yet actually, just don't complain on freaking cygwin, since that's where this happens + chown -R "$(logname):$(logname)" \ + "$FEISTY_MEOW_LOADING_DOCK"/* "$FEISTY_MEOW_GENERATED_STORE"/* 2>/dev/null + test_or_continue "chowning to $(logname) didn't happen." 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")" - local fail_message="\nare the perl dependencies installed? if you're on ubuntu or debian, try this:\n - $(grep "apt.*perl" $FEISTY_MEOW_APEX/readme.txt)\n" - + local fail_message="\n +are the perl dependencies installed? if you're on ubuntu or debian, try this:\n + $(grep "apt-get.*perl" $FEISTY_MEOW_APEX/readme.txt)\n +or if you're on cygwin, then try this (if apt-cyg is available):\n + $(grep "apt-cyg.*perl" $FEISTY_MEOW_APEX/readme.txt)\n"; + #echo "the incongruous files list is: $incongruous_files" # disallow a single character result, since we get "*" as result when nothing exists yet. if [ ${#incongruous_files} -ge 2 ]; then @@ -510,7 +517,9 @@ if [ -z "$skip_all" ]; then regenerate # prevent permission foul-ups, again. - chown -R "$(logname):$(logname)" "$FEISTY_MEOW_LOADING_DOCK" "$FEISTY_MEOW_GENERATED_STORE" + chown -R "$(logname):$(logname)" \ + "$FEISTY_MEOW_LOADING_DOCK" "$FEISTY_MEOW_GENERATED_STORE" 2>/dev/null + test_or_continue "chowning to $(logname) didn't happen." restore_terminal_title } @@ -868,7 +877,7 @@ return 0 #var filename seeker numlines # make a backup first, oy. - \cp -f "$filename" "$filename.bkup-${RANDOM}" + \cp -f "$filename" "/tmp/$(basename ${filename}).bkup-${RANDOM}" test_or_die "backing up file: $filename" # make a temp file to write to before we move file into place in bind.