[Fusionforge-commits] r12296 - trunk/tools/VM-scripts

Olivier Berger olberger at fusionforge.org
Fri Feb 18 16:43:41 CET 2011


Author: olberger
Date: 2011-02-18 16:43:40 +0100 (Fri, 18 Feb 2011)
New Revision: 12296

Modified:
   trunk/tools/VM-scripts/configure-scripts.sh
Log:
Adding check on the presence of the scripts dir in the checked-out version, in case it's already too old.

Modified: trunk/tools/VM-scripts/configure-scripts.sh
===================================================================
--- trunk/tools/VM-scripts/configure-scripts.sh	2011-02-18 15:36:42 UTC (rev 12295)
+++ trunk/tools/VM-scripts/configure-scripts.sh	2011-02-18 15:43:40 UTC (rev 12296)
@@ -68,15 +68,19 @@
     rm ./scripts
 fi
 
-echo "Creating a link from 'fusionforge-$BRANCH/tools/VM-scripts/' to './scripts'."
-ln -s "fusionforge-$BRANCH/tools/VM-scripts/" scripts
+if [ -d "fusionforge-$BRANCH/tools/VM-scripts/" ]; then
+    echo "Creating a link from 'fusionforge-$BRANCH/tools/VM-scripts/' to './scripts'."
+    ln -s "fusionforge-$BRANCH/tools/VM-scripts/" scripts
 
-if [ -L scripts/reload-db.sh ]; then
-    oldlink=$(ls -ld scripts/reload-db.sh)
-    echo "Removing old scripts/reload-db.sh link ($oldlink)"
-    rm scripts/reload-db.sh
+    if [ -L scripts/reload-db.sh ]; then
+	oldlink=$(ls -ld scripts/reload-db.sh)
+	echo "Removing old scripts/reload-db.sh link ($oldlink)"
+	rm scripts/reload-db.sh
+    fi
+
+    echo "Creating a link from 'fusionforge-$BRANCH/tests/func/db_reload.sh' to 'scripts/reload-db.sh'."
+    ln -s "../../tests/func/db_reload.sh" scripts/reload-db.sh
+else
+    echo "Warning: there appears to be no 'fusionforge-$BRANCH/tools/VM-scripts/' directory."
+    echo "You may need to update the contents of the checked-out copy in 'fusionforge-$BRANCH/'."
 fi
-
-echo "Creating a link from 'fusionforge-$BRANCH/tests/func/db_reload.sh' to 'scripts/reload-db.sh'."
-ln -s "../../tests/func/db_reload.sh" scripts/reload-db.sh
-




More information about the Fusionforge-commits mailing list