Changeset 494 for branches/confman-1.9/confmanlib.sh.in

Timestamp:

11/11/2009 16:40:08 (3 years ago)

Author:

ccowart

Message:

Merging fixes to sed -i as well as support for rename to update recipe
files.

Resolves #96, #98

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confmanlib.sh.in (modified) (4 diffs)

branches/confman-1.9/confmanlib.sh.in

@@ -422 +422 @@
         for directory in `find -L $moduledir -mindepth 1 -type d | grep -v "\.svn"`;
     do
-                local livedir=`echo $directory | sed "s:$moduledir::"`
+                local livedir=`echo $directory | ${sed_cmd} -e "s:$moduledir::"`
                 livedir="${LIVE_ROOT}${livedir}"
                 local owner=`conf_get_prop ${directory} owner`
@@ -433 +433 @@
         done
         for file in `find -L $moduledir -type f | grep -v "\.svn"` ; do
-                local livefile=`echo "$file" | sed "s:$moduledir::"`
+                local livefile=`echo "$file" | ${sed_cmd} -e "s:$moduledir::"`
                 local owner=`conf_get_prop ${file} owner`
                 local group=`conf_get_prop ${file} group`
@@ -798 +798 @@
         local mode=$4
         local workdir=""
-        local directories=`echo "$directory" | sed 's:/: :g'`
+        local directories=`echo "$directory" | ${sed_cmd} -e 's:/: :g'`
         local dir
 
@@ -858 +858 @@
     done
 
-    find ${WORK_PATH}/${newmod} -type f -not -path '*/.svn/*' -exec \
-        ${sed_cmd} -i"" \
-        "s/(Managed under )${oldmod}( module\.)$/\1${newmod}\2/" {} \; \
-        || return 1
+    for file in $(find ${WORK_PATH}/${newmod} -type f -not -path '*/.svn/*')
+    do
+        sed_i_cmd \
+            "s/(Managed under )${oldmod}( module\.)$/\1${newmod}\2/" "$file" \
+            || return 1
+    done
+
+    for file in $(find $(conf_recipe_dir) -maxdepth 1 -type f); do
+        sed_i_cmd "s/^([ \t]*)${oldmod}([ \t]*)$/\1${newmod}\2/" "$file" || 
+        return 1
+    done
 
     @SVN@ commit -m "Renaming ${oldmod} to ${newmod}" \
         ${WORK_PATH}/${oldmod} ${WORK_PATH}/${REPO_CHECKPTS}/${oldmod} \
         ${WORK_PATH}/${newmod} ${WORK_PATH}/${REPO_CHECKPTS}/${newmod} \
-        || return 1
+        $(conf_recipe_dir) || return 1
 
     return 0