Changeset 90 for confman/confmanlib.sh

Timestamp:

04/19/2006 14:01:22 (6 years ago)

Author:

ccowart

Message:

Singularity support for the inst function. See Bug #4204

File:

• confman/confmanlib.sh (modified) (2 diffs)

confman/confmanlib.sh

@@ -106 +106 @@
 function conf_install {
   local module="$1"
-  local file="$2"
+  local file=`abspath $2`
   local moduledir="${WORK_PATH}/$module"
   local livefile=`echo "$file" | sed -E "s:${WORK_PATH}/[^/]+::"`
+  local pathmodule=`echo "$file" | sed -E "s:${WORK_PATH}/([^/]+).*:\1:"`
+  local suffix
+  livefile=`echo "$livefile" | sed -E "s:-${pathmodule}$::"`
+  if [[ $SINGULARITIES =~ $livefile ]] ; then
+          suffix="-${module}"
+  fi
+  livefile="${livefile}${suffix}"
+
 
   # See if it even exists
@@ -319 +327 @@
 }
 
-  
-
+function conf_cleanexit {
+  rm -f /tmp/confman*
+
+  # And in case we got an interrupt during a rollout, we still want the
+  # permissions here to be in a consistent state.
+  chmod 700 ${WORK_PATH}
+
+  # And this clears any locks we may have created on our working copy:
+  svn cleanup ${WORK_PATH}
+
+  if [ -z $1 ] ; then
+        exit 1
+  else
+        exit $1
+  fi
+
+}  
+