Changeset 94 for confman/confmanlib.sh

Timestamp:

04/20/2006 19:49:11 (6 years ago)

Author:

ccowart

Message:

Tweaked the inst function

File:

• confman/confmanlib.sh (modified) (4 diffs)

confman/confmanlib.sh

@@ -106 +106 @@
 function conf_install {
   local module="$1"
-  local file=`abspath $2`
+  shift
+  local file=`abspath $1`
+  shift
   local moduledir="${WORK_PATH}/$module"
   local livefile=`echo "$file" | sed -E "s:${WORK_PATH}/[^/]+::"`
@@ -135 +137 @@
   $cmd
   chmod o-rx ${WORK_PATH}
+
+  if [ ! -z $1 ] ; then
+          conf_install $module $*
+  fi
 }
 
@@ -160 +166 @@
           livepart="${LIVE_ROOT}${file}-${layer}"
           myfile="${WORK_PATH}/${layer}/${file}-${layer}"
-          if [ -f $myfile ] ; then
+          if [ -f $myfile -a -f $livepart ] ; then
                   owner=`conf_get_prop ${myfile} owner`
                   group=`conf_get_prop ${myfile} group`
@@ -176 +182 @@
         $cmd
   fi
-  rm $tmpfile
+  rm -f $tmpfile
 }