Changeset 177 for tags/confman-1.5.5a/confsync.sh

Timestamp:

10/08/2007 17:12:27 (5 years ago)

Author:

arjun

Message:

Commiting 1.5.5a

File:

• tags/confman-1.5.5a/confsync.sh (modified) (2 diffs)

tags/confman-1.5.5a/confsync.sh

@@ -12 +12 @@
 ##
 
-. /usr/local/rescomp/lib/confmancommon.sh
+# Try loading a development library first
+if [ -r ./confmancommon.sh ] ; then
+    echo "Loading development library from current working directory." >&2
+    . ./confmancommon.sh
+elif [ -r /usr/local/rescomp/lib/confmancommon.sh ] ; then
+    . /usr/local/rescomp/lib/confmancommon.sh
+else
+    echo "Can't find confmancommon.sh. Exiting." >&2
+fi
 
 # If we're in debug mode, we should log stderr messages to the logger
@@ -58 +66 @@
 for layer in $LAYERS ; do
         echo "Rolling on $layer..."
-        conf_rollout $layer || conf_cleanexit
+        conf_rollout $layer || conf_cleanExit
 done
 for file in $SINGULARITIES ; do
     echo "Assembing singularity $file..."
-        conf_assemble_sing $file || conf_cleanexit
+        conf_assemble_sing $file || conf_cleanExit
 done
 conf_markclean