Changeset 500

Timestamp:

11/12/2009 14:30:46 (2 years ago)

Author:

blee

Message:

Merge from trunk singularity fixes for confman install and
minor recipe creation fix.

Resolves #102, #103, #104

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confman.in (modified) (4 diffs)
• confmanlib.sh.in (modified) (1 diff)

branches/confman-1.9/confman.in

@@ -254 +254 @@
 function inst {
     local file livefile
-    local msg status files file sing
+    local msg status files
     local nocommit=true
     local system_lock wcopy_lock
     local opt OPTIND OPTARG
+    local module
 
     while getopts ":m:F:" opt ; do
@@ -270 +271 @@
     shift $(($OPTIND - 1))
 
+    [ -n "$1" ] || print_usage 1
+
     system_lock=$(conf_lock_system)
     wcopy_lock=$(conf_lock_wcopy)
@@ -290 +293 @@
     
     for layer in $(conf_get_recipe) ; do
-        conf_install $layer "$@"
+        for file in "$@"; do
+            module=$(conf_wfile_module $file)
+            if conf_wfile_is_singularity $file; then
+                conf_install $layer "${file%-$module}-${layer}"
+            else
+                conf_install $layer "$file"
+            fi
+        done
     done
     for file in $SINGULARITIES ; do
@@ -1010 +1020 @@
     if [ -z "$new_recipe_file" ] ; then
         if ! recipe_edit "$recipe" ; then
-            conf_rm_file --force "${new_recipe_file}"
+            conf_rm_file --force "${recipe_file}"
             conf_unlock_wcopy $wcopy_lock
             return 1

branches/confman-1.9/confmanlib.sh.in

@@ -455 +455 @@
 }
 
+# Takes a working copy file path and returns the corresponding live file path
 function conf_livefile {
     local file="$1"
     local path=$(conf_rel_path "$file") || return
-    echo ${path#*/}/
-}
-
+    echo /${path#*/}
+}
+
+# Takes a working copy file path and returns whether it is a singularity
 function conf_wfile_is_singularity {
+    local file=$(${readlink_cmd} -m "$1")
+    local module=$(conf_wfile_module $file)
+    local livefile=$(conf_livefile $file)
+    local sing
+    for sing in $SINGULARITIES ; do
+        if [ "$sing" = ${livefile%-$module} ] ; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+# Takes a working copy file path and returns the associated module
+function conf_wfile_module {
     local file=$(${readlink_cmd} -m "$1")
     ABS_WORK=$(${readlink_cmd} -m "$WORK_PATH")
     local module=${file#${ABS_WORK}/}
     module=${module%%/*}
-    local livefile=$(conf_livefile $file)
-    local sing
-    for sing in $SINGULARITIES ; do
-        if [ "$sing" = "${livefile%-$module}" ] ; then
-            return 0
-        fi
-    done
-    return 1
+    echo "$module"
 }