Changeset 34


Ignore:
Timestamp:
03/28/2006 21:22:28 (6 years ago)
Author:
ccowart
Message:

Pesky modules in usage statement anyways. --ccowart

Location:
confman
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • confman/confman

    r33 r34  
    567567 
    568568function chowner { 
    569         local module=$1 
     569        local owner=$1 
    570570        local file=$2 
    571         local owner=$3 
    572         conf_set_prop $module $file owner $owner 
     571        conf_set_prop $file owner $owner 
    573572} 
    574573 
    575574function chgroup { 
    576         local module=$1 
     575        local group=$1 
    577576        local file=$2 
    578         local group=$3 
    579         conf_set_prop $module $file group $group 
     577        conf_set_prop $file group $group 
    580578} 
    581579 
    582580function chmode { 
    583         local module=$1 
     581        local mode=$1 
    584582        local file=$2 
    585         local mode=$3 
    586         conf_set_prop $module $file mode $mode 
     583        conf_set_prop $file mode $mode 
    587584} 
    588585 
    589586function chcom { 
    590         local module=$1 
     587        local comment="$1" 
    591588        local file=$2 
    592         local comment="$3" 
    593         conf_set_prop $module $file comment "$comment" 
     589        conf_set_prop $file comment "$comment" 
    594590} 
    595591 

  • confman/confmanlib.sh

    r32 r34  
    5353          livedir="${LIVE_ROOT}${livedir}" 
    5454          if [ ! -d $livedir ] ; then 
    55                   local owner=`conf_get_prop ${module} ${directory} owner` 
    56                   local group=`conf_get_prop ${module} ${directory} group` 
    57                   local mode=`conf_get_prop ${module}  ${directory} mode` 
     55                  local owner=`conf_get_prop ${directory} owner` 
     56                  local group=`conf_get_prop ${directory} group` 
     57                  local mode=`conf_get_prop ${directory} mode` 
    5858                  local opts="-d -o $owner -g $group -m $mode" 
    5959                  local cmd="sudo install $opts $livedir" 
    … …  
    6464  for file in `find $moduledir -type f | grep -v "\.svn"` ; do 
    6565          local livefile=`echo "$file" | sed "s:$moduledir::"` 
    66           local owner=`conf_get_prop ${module} ${file} owner` 
    67           local group=`conf_get_prop ${module} ${file} group` 
    68           local mode=`conf_get_prop ${module} ${file} mode` 
     66          local owner=`conf_get_prop ${file} owner` 
     67          local group=`conf_get_prop ${file} group` 
     68          local mode=`conf_get_prop ${file} mode` 
    6969          local opts="-Sp -o $owner -g $group -m $mode" 
    7070          local cmd="sudo install $opts $file ${LIVE_ROOT}$livefile" 
    … …  
    8181  local module=`echo ${file#$WORK_PATH} | sed -E 's:/([^/]+)/.*:\1:'` 
    8282  local livefile=`echo ${file#$WORK_PATH} | sed -E 's:/([^/]+)/:/:'` 
    83   local owner=`conf_get_prop ${module} ${file} owner` 
    84   local group=`conf_get_prop ${module} ${file} group` 
    85   local mode=`conf_get_prop ${module} ${file} mode` 
    86   local comment=`conf_get_prop ${module} ${file} comment` 
     83  local owner=`conf_get_prop ${file} owner` 
     84  local group=`conf_get_prop ${file} group` 
     85  local mode=`conf_get_prop ${file} mode` 
     86  local comment=`conf_get_prop ${file} comment` 
    8787  echo -e "$mode\t$owner\t$group\t$comment\t\t$livefile" 
    8888} 
    … …  
    100100          myfile="${WORK_PATH}/${layer}/${file}-${layer}" 
    101101          if [ -f $myfile ] ; then 
    102                   owner=`conf_get_prop ${layer} ${myfile} owner` 
    103                   group=`conf_get_prop ${layer} ${myfile} group` 
    104                   mode=`conf_get_prop  ${layer} ${myfile} mode` 
    105                   comment=`conf_get_prop  ${layer} ${myfile} comment` 
     102                  owner=`conf_get_prop ${myfile} owner` 
     103                  group=`conf_get_prop ${myfile} group` 
     104                  mode=`conf_get_prop  ${myfile} mode` 
     105                  comment=`conf_get_prop  ${myfile} comment` 
    106106                  msg="This portion controled under the ${layer} module." 
    107107                  echo "${comment} $msg" >> $tmpfile 
    … …  
    173173# This function will print the value of the specified property to STDOUT 
    174174function conf_get_prop { 
    175   local module=$1 
    176   local file=$2 
    177   local prop=$3 
     175  local file=$1 
     176  local prop=$2 
    178177  svn propget "confman:${prop}" ${file} 
    179178} 
    … …  
    181180# This function will set the value of the specified property. 
    182181function conf_set_prop { 
    183   local module=$1 
    184   local file=$2 
    185   local prop=$3 
    186   local value=$4 
     182  local file=$1 
     183  local prop=$2 
     184  local value=$3 
    187185  svn propset "confman:${prop}" "${value}" ${file} 
    188186} 
    … …  
    213211  svn add $myfile 
    214212  svn ps svn:keywords "Id" $myfile 
    215   conf_set_prop $module $myfile owner $owner 
    216   conf_set_prop $module $myfile group $group 
    217   conf_set_prop $module $myfile mode  $mode 
    218   conf_set_prop $module $myfile comment "$comment" 
     213  conf_set_prop $myfile owner $owner 
     214  conf_set_prop $myfile group $group 
     215  conf_set_prop $myfile mode  $mode 
     216  conf_set_prop $myfile comment "$comment" 
    219217} 
    220218 
    … …  
    242240                  echo svn mkdir ${workdir} 
    243241                  svn mkdir ${workdir} 
    244                   conf_set_prop $module $workdir owner $owner 
    245                   conf_set_prop $module $workdir group $group 
    246                   conf_set_prop $module $workdir mode $mode 
    247                   conf_set_prop $module $workdir comment "dir" 
     242                  conf_set_prop $workdir owner $owner 
     243                  conf_set_prop $workdir group $group 
     244                  conf_set_prop $workdir mode $mode 
     245                  conf_set_prop $workdir comment "dir" 
    248246          fi 
    249247  done 
Note: See TracChangeset for help on using the changeset viewer.