From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 23 Apr 2013 21:28:31 +0000 (-0400)
Subject: minor changes in names in build_xsedes file.  nice balancing act in the recustomize... 
X-Git-Tag: 2.140.90~1001
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=b6fefd0947fae2cec0ab449b3bd10a5285b1099b;p=feisty_meow.git

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.
---

diff --git a/customizing/fred/build_cak0l.sh b/customizing/fred/build_cak0l.sh
deleted file mode 100644
index 303b8fa2..00000000
--- a/customizing/fred/build_cak0l.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
-
-function build_xsede()
-{
-  pushd ~/xsede/code/cak0l/trunk
-  if [ $? -ne 0 ]; then return 1; fi
-  echo "Build starting at: $(date)"
-  \rm -rf unit-test-reports
-  ant -Dbuild.targetArch=64 build
-  if [ $? -ne 0 ]; then return 1; fi
-  # fix memory limits.
-#hmmm: clean these up.
-  if [ -f runContainer.sh ]; then
-    sed -i -e "s/-Xmx512M/-Xmx2G/" "runContainer.sh" 
-    chmod 755 "runContainer.sh" 
-  fi
-  if [ -f grid ]; then
-#    sed -i -e "s/-Xmx512M/-Xmx1G/" "grid"
-    chmod 755 "grid"
-  fi
-  if [ -f runContainer.bat ]; then
-    sed -i -e "s/-Xmx512M/-Xmx2G/" "runContainer.bat"
-    chmod 755 "runContainer.bat" 
-  fi
-  if [ -f grid.bat ]; then
-#    sed -i -e "s/-Xmx512M/-Xmx1G/" "grid.bat"
-    chmod 755 "grid.bat"
-  fi
-  echo "Build done at: $(date)"
-  popd
-}
-
-function rebuild_xsede()
-{
-  pushd ~/xsede/code/cak0l/trunk
-  ant clean
-  if [ $? -ne 0 ]; then return 1; fi
-  popd
-  build_xsede
-}
-
diff --git a/customizing/fred/build_xsedes.sh b/customizing/fred/build_xsedes.sh
new file mode 100644
index 00000000..25ae50e6
--- /dev/null
+++ b/customizing/fred/build_xsedes.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+
+function build_xsede()
+{
+  pushd ~/xsede/code/fred/trunk
+  if [ $? -ne 0 ]; then return 1; fi
+  echo "Build starting at: $(date)"
+  \rm -rf unit-test-reports
+  ant -Dbuild.targetArch=64 build
+  if [ $? -ne 0 ]; then return 1; fi
+  # fix memory limits.
+#hmmm: clean these up.
+  if [ -f runContainer.sh ]; then
+    sed -i -e "s/-Xmx512M/-Xmx2G/" "runContainer.sh" 
+    chmod 755 "runContainer.sh" 
+  fi
+  if [ -f grid ]; then
+#    sed -i -e "s/-Xmx512M/-Xmx1G/" "grid"
+    chmod 755 "grid"
+  fi
+  if [ -f runContainer.bat ]; then
+    sed -i -e "s/-Xmx512M/-Xmx2G/" "runContainer.bat"
+    chmod 755 "runContainer.bat" 
+  fi
+  if [ -f grid.bat ]; then
+#    sed -i -e "s/-Xmx512M/-Xmx1G/" "grid.bat"
+    chmod 755 "grid.bat"
+  fi
+  echo "Build done at: $(date)"
+  popd
+}
+
+function rebuild_xsede()
+{
+  pushd ~/xsede/code/fred/trunk
+  ant clean
+  if [ $? -ne 0 ]; then return 1; fi
+  popd
+  build_xsede
+}
+
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
   }