X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=924266dc781f911ae5ec5c7f382e955ae22f5176;hb=2a3a67a56b96e32b09e50e8ca9f29416fe42eff7;hp=1129d33669eb41800cb9609b64dce7bfbae39f1c;hpb=75b42e929b4ea9f350ef23041f5cb87073584771;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 1129d336..924266dc 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -291,7 +291,16 @@ if [ -z "$skip_all" ]; then return 1 fi regenerate >/dev/null + pushd "$FEISTY_MEOW_GENERATED/custom" &>/dev/null + local incongruous_files="$(bash "$FEISTY_MEOW_SCRIPTS/files/list_non_dupes.sh" "$FEISTY_MEOW_DIR/customizing/$user" "$FEISTY_MEOW_GENERATED/custom")" + if [ ${#incongruous_files} -ge 1 ]; then + echo "cleaning unknown older overrides..." + perl "$FEISTY_MEOW_SCRIPTS/files/safedel.pl" $incongruous_files + echo + fi + popd &>/dev/null echo "copying custom overrides for $user" + mkdir "$FEISTY_MEOW_GENERATED/custom" 2>/dev/null perl "$FEISTY_MEOW_SCRIPTS/text/cpdiff.pl" "$FEISTY_MEOW_DIR/customizing/$user" "$FEISTY_MEOW_GENERATED/custom" regenerate }