Changeset 94

Timestamp:

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

Author:

ccowart

Message:

Tweaked the inst function

Location:

confman

Files:

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

confman/confman

@@ -33 +33 @@
         . $GCONF
 else
-        echo "Error: Global config file couldn't be located" >&2
+        echo "Global config file couldn't be located" >&2
         exit 1
 fi
@@ -51 +51 @@
         . $REPO_LIBRARY
 else
-        echo "Error: Couldn't source the confman shell library" >&2
+        echo "Couldn't source the confman shell library" >&2
         exit 1
 fi
@@ -59 +59 @@
         . $REPO_DOCS
 else
-        echo "Error: Couldn't source the confman shell library" >&2
+        echo "Couldn't source the confman shell library" >&2
         exit 1
 fi
@@ -67 +67 @@
         LAYERS=`cat $RECIPE_PATH | grep "^[^#]"`
 else
-        echo "Error: Couldn't read the host's recipe!" >&2
+        echo "Couldn't read the host's recipe!" >&2
         exit 1
 fi
@@ -171 +171 @@
         local file livefile
 
-        if [ -z $* ] ; then
+        if [ -z "$*" ] ; then
                 print_usage 1
         elif [ ! -e $1 ] ; then
@@ -181 +181 @@
                 echo "Change this file to your log message." > $msg
                 ${EDITOR} $msg
-                update || conf_cleanexit
+
+                # If there's a failure, the user will update. Don't need to
+                # hide this from them.
+                # update || conf_cleanexit
 
                 echo "Installation operation started." >&2

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
 }