Changeset 495 for trunk/confman.in

Timestamp:

11/12/2009 11:06:23 (2 years ago)

Author:

blee

Message:

Fix the installation of singularities.

There are a few corresponding library function fixes for:

• conf_livefile
• conf_wfile_is_singularity

and a new library function, conf_wfile_module.

Fixes #102

File:

• trunk/confman.in (modified) (2 diffs)

trunk/confman.in

@@ -254 +254 @@
 function inst {
     local file livefile
-    local msg status files file sing
+    local msg status files args
     local nocommit=true
     local system_lock wcopy_lock
     local opt OPTIND OPTARG
+    local module
 
     while getopts ":m:F:" opt ; do
@@ -290 +291 @@
     
     for layer in $(conf_get_recipe) ; do
-        conf_install $layer "$@"
+        # Fix singularities in the file arguments
+        args=
+        for file in "$@"; do
+            module=$(conf_wfile_module $file)
+            if conf_wfile_is_singularity $file; then
+                args="${args:+${args} }${file%-$module}-${layer}"
+            else
+                args="${args:+${args} }${file}"
+            fi
+        done
+
+        conf_install $layer "$args"
     done
     for file in $SINGULARITIES ; do