Changeset 34 for confman/confmanlib.sh

Timestamp:

03/28/2006 21:22:28 (6 years ago)

Author:

ccowart

Message:

Pesky modules in usage statement anyways. --ccowart

File:

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

confman/confmanlib.sh

@@ -53 +53 @@
           livedir="${LIVE_ROOT}${livedir}"
           if [ ! -d $livedir ] ; then
-                  local owner=`conf_get_prop ${module} ${directory} owner`
-                  local group=`conf_get_prop ${module} ${directory} group`
-                  local mode=`conf_get_prop ${module}  ${directory} mode`
+                  local owner=`conf_get_prop ${directory} owner`
+                  local group=`conf_get_prop ${directory} group`
+                  local mode=`conf_get_prop ${directory} mode`
                   local opts="-d -o $owner -g $group -m $mode"
                   local cmd="sudo install $opts $livedir"
@@ -64 +64 @@
   for file in `find $moduledir -type f | grep -v "\.svn"` ; do
           local livefile=`echo "$file" | sed "s:$moduledir::"`
-          local owner=`conf_get_prop ${module} ${file} owner`
-          local group=`conf_get_prop ${module} ${file} group`
-          local mode=`conf_get_prop ${module} ${file} mode`
+          local owner=`conf_get_prop ${file} owner`
+          local group=`conf_get_prop ${file} group`
+          local mode=`conf_get_prop ${file} mode`
           local opts="-Sp -o $owner -g $group -m $mode"
           local cmd="sudo install $opts $file ${LIVE_ROOT}$livefile"
@@ -81 +81 @@
   local module=`echo ${file#$WORK_PATH} | sed -E 's:/([^/]+)/.*:\1:'`
   local livefile=`echo ${file#$WORK_PATH} | sed -E 's:/([^/]+)/:/:'`
-  local owner=`conf_get_prop ${module} ${file} owner`
-  local group=`conf_get_prop ${module} ${file} group`
-  local mode=`conf_get_prop ${module} ${file} mode`
-  local comment=`conf_get_prop ${module} ${file} comment`
+  local owner=`conf_get_prop ${file} owner`
+  local group=`conf_get_prop ${file} group`
+  local mode=`conf_get_prop ${file} mode`
+  local comment=`conf_get_prop ${file} comment`
   echo -e "$mode\t$owner\t$group\t$comment\t\t$livefile"
 }
@@ -100 +100 @@
           myfile="${WORK_PATH}/${layer}/${file}-${layer}"
           if [ -f $myfile ] ; then
-                  owner=`conf_get_prop ${layer} ${myfile} owner`
-                  group=`conf_get_prop ${layer} ${myfile} group`
-                  mode=`conf_get_prop  ${layer} ${myfile} mode`
-                  comment=`conf_get_prop  ${layer} ${myfile} comment`
+                  owner=`conf_get_prop ${myfile} owner`
+                  group=`conf_get_prop ${myfile} group`
+                  mode=`conf_get_prop  ${myfile} mode`
+                  comment=`conf_get_prop  ${myfile} comment`
                   msg="This portion controled under the ${layer} module."
                   echo "${comment} $msg" >> $tmpfile
@@ -173 +173 @@
 # This function will print the value of the specified property to STDOUT
 function conf_get_prop {
-  local module=$1
-  local file=$2
-  local prop=$3
+  local file=$1
+  local prop=$2
   svn propget "confman:${prop}" ${file}
 }
@@ -181 +180 @@
 # This function will set the value of the specified property.
 function conf_set_prop {
-  local module=$1
-  local file=$2
-  local prop=$3
-  local value=$4
+  local file=$1
+  local prop=$2
+  local value=$3
   svn propset "confman:${prop}" "${value}" ${file}
 }
@@ -213 +211 @@
   svn add $myfile
   svn ps svn:keywords "Id" $myfile
-  conf_set_prop $module $myfile owner $owner
-  conf_set_prop $module $myfile group $group
-  conf_set_prop $module $myfile mode  $mode
-  conf_set_prop $module $myfile comment "$comment"
+  conf_set_prop $myfile owner $owner
+  conf_set_prop $myfile group $group
+  conf_set_prop $myfile mode  $mode
+  conf_set_prop $myfile comment "$comment"
 }
 
@@ -242 +240 @@
                   echo svn mkdir ${workdir}
                   svn mkdir ${workdir}
-                  conf_set_prop $module $workdir owner $owner
-                  conf_set_prop $module $workdir group $group
-                  conf_set_prop $module $workdir mode $mode
-                  conf_set_prop $module $workdir comment "dir"
+                  conf_set_prop $workdir owner $owner
+                  conf_set_prop $workdir group $group
+                  conf_set_prop $workdir mode $mode
+                  conf_set_prop $workdir comment "dir"
           fi
   done