Changeset 500 for branches/confman-1.9/confmanlib.sh.in

Timestamp:

11/12/2009 14:30:46 (3 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)
• confmanlib.sh.in (modified) (1 diff)

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"
 }