Make getFileArray handle multiple files as well.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Sat, 9 Dec 2006 16:02:03 +0000 (16:02 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Sat, 9 Dec 2006 16:02:03 +0000 (16:02 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2420 94cd875c-1c1d-0410-91d2-eb244daf1a30

scripts/functions

index 61dbd00..d15cd41 100644 (file)
@@ -636,13 +636,17 @@ function getFileValue
     eval read "$_gfv_var" <"$_gfv_file"
 }
 
-## Called as 'getFileArray <varname> <filename>'
+## Called as 'getFileArray <varname> <filename>+'
 function getFileArray
 {
-    test -r "$2" || return 1
-    
+    local _gfa_var=$1
+    local _gfa_file
+    shift
+
+    findFile _gfa_file "$@" ''
+    test -n "$_gfa_file" -a -r "$_gfa_file" || return 0
     local IFS=$_VS_NEWLINE
-    eval "$1"='( $(< "$2") )'
+    eval "$_gfa_var"='( $(< "$_gfa_file") )'
 }
 
 function checkComponents