Changeset 498 for trunk

Timestamp:

11/12/2009 12:10:43 (3 years ago)

Author:

ccowart

Message:

Moving the call to conf_install_file up into the for loop
to overcome the shell quoting issue.

See #102

File:

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

trunk/confman.in

@@ -254 +254 @@
 function inst {
     local file livefile
-    local msg status files args
+    local msg status files
     local nocommit=true
     local system_lock wcopy_lock
@@ -294 +294 @@
     for layer in $(conf_get_recipe) ; do
         # 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}"
+                conf_install $layer "${file%-$module}-${layer}"
             else
-                args="${args:+${args} }${file}"
+                conf_install $layer "$file"
             fi
+            conf_install $layer "$file"
         done
-
-        conf_install $layer "$args"
     done
     for file in $SINGULARITIES ; do