From b6fefd0947fae2cec0ab449b3bd10a5285b1099b Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 23 Apr 2013 17:28:31 -0400 Subject: [PATCH 1/1] minor changes in names in build_xsedes file. nice balancing act in the recustomize macro now; we wanted to not just whack the directory, since people might have added things besides a canonical customization set. however, if we don't whack the directory, there will be a bogus old version of a script if the customization files have had a file deleted or renamed. so, in a compromise to fix this, we now use the feisty meow version of safedel to remove the old custom folder, so that any extra stuff is actually preserved. and this script noisily tells what it did, so the user can see the folder went away. --- customizing/fred/{build_cak0l.sh => build_xsedes.sh} | 4 ++-- scripts/core/functions.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) rename customizing/fred/{build_cak0l.sh => build_xsedes.sh} (93%) diff --git a/customizing/fred/build_cak0l.sh b/customizing/fred/build_xsedes.sh similarity index 93% rename from customizing/fred/build_cak0l.sh rename to customizing/fred/build_xsedes.sh index 303b8fa2..25ae50e6 100644 --- a/customizing/fred/build_cak0l.sh +++ b/customizing/fred/build_xsedes.sh @@ -4,7 +4,7 @@ source "$FEISTY_MEOW_SCRIPTS/core/functions.sh" function build_xsede() { - pushd ~/xsede/code/cak0l/trunk + pushd ~/xsede/code/fred/trunk if [ $? -ne 0 ]; then return 1; fi echo "Build starting at: $(date)" \rm -rf unit-test-reports @@ -34,7 +34,7 @@ function build_xsede() function rebuild_xsede() { - pushd ~/xsede/code/cak0l/trunk + pushd ~/xsede/code/fred/trunk ant clean if [ $? -ne 0 ]; then return 1; fi popd diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 1129d336..60f57629 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -292,6 +292,8 @@ if [ -z "$skip_all" ]; then fi regenerate >/dev/null echo "copying custom overrides for $user" + perl "$FEISTY_MEOW_SCRIPTS/files/safedel.pl" "$FEISTY_MEOW_GENERATED/custom" + mkdir "$FEISTY_MEOW_GENERATED/custom" perl "$FEISTY_MEOW_SCRIPTS/text/cpdiff.pl" "$FEISTY_MEOW_DIR/customizing/$user" "$FEISTY_MEOW_GENERATED/custom" regenerate } -- 2.34.1