X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=c60c94319e4e24d126e700465c66e9ece8edcecd;hb=f3a6c7fd1aa6f162b872886daa00dc13c6ae8eee;hp=daaabcb16cece5a745d7735421fbecfc1c4691f3;hpb=ad0aaf02eb28477e421eb2ec558c290ab41827ca;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index daaabcb1..c60c9431 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -488,9 +488,12 @@ if [ -z "$skip_all" ]; then 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 @@ -507,7 +510,8 @@ if [ -z "$skip_all" ]; then if [ -d "$FEISTY_MEOW_SCRIPTS/customize/$custom_user/scripts" ]; then echo "copying custom scripts for $custom_user" - netcp "$FEISTY_MEOW_SCRIPTS/customize/$custom_user/scripts" "$FEISTY_MEOW_LOADING_DOCK/custom/" &>/dev/null + rsync -avz "$FEISTY_MEOW_SCRIPTS/customize/$custom_user/scripts" "$FEISTY_MEOW_LOADING_DOCK/custom/" &>/dev/null + test_or_continue "copying customization scripts" #hmmm: could save output to show if an error occurs. fi echo