Changeset 492

Timestamp:

11/11/2009 16:37:02 (2 years ago)

Author:

ccowart

Message:

Apparently doing sed_i_cmd in a variable has quoting issues and
doesn't perform as expected. I have factored the -i "" logic out
by defining a sed_i_cmd function differently on a per-OS basis.

I have also used the new sed_i_cmd idiom to solve the recipe updates on
renames issue.

Fixes #96, #98

Location:

trunk

Files:

• confman.in (modified) (1 diff)
• confmancommon.sh.in (modified) (3 diffs)
• confmanlib.sh.in (modified) (1 diff)

trunk/confman.in

@@ -157 +157 @@
     done
     rm -f "$orig_log"
-    ${sed_i_cmd} -e "/${ignoreline}/,\$d" "$logfile" 2>/dev/null
+    sed_i_cmd -e "/${ignoreline}/,\$d" "$logfile" 2>/dev/null
     echo "$logfile"
     return 0

trunk/confmancommon.sh.in

@@ -76 +76 @@
     mktemp_dir="mktemp -d -t confman"
     sed_cmd="sed -E"
-    sed_i_cmd="${sed_cmd} -i \"\""
+    function sed_i_cmd {
+        ${sed_cmd} -i '' "$@"
+    }
     stat_cmd="stat -f"
     stat_opts="mode=%Mp%Lp owner=%Su group=%Sg"
@@ -86 +88 @@
     mktemp_dir="mktemp -t -d confman.XXXXXX"
     sed_cmd="sed -r"
-    sed_i_cmd="${sed_cmd} -i"
+    function sed_i_cmd {
+        ${sed_cmd} -i "$@"
+    }
     stat_cmd="stat -c"
     stat_opts="mode=%a owner=%U group=%G"
@@ -96 +100 @@
     mktemp_dir="mktemp -d -t confman"
     sed_cmd="sed -E"
-    sed_i_cmd="${sed_cmd} -i \"\""
+    function sed_i_cmd {
+        ${sed_cmd} -i '' "$@"
+    }
     stat_cmd="stat -f"
     stat_opts="mode=%Mp%Lp owner=%Su group=%Sg"

trunk/confmanlib.sh.in

@@ -858 +858 @@
     done
 
-    find ${WORK_PATH}/${newmod} -type f -not -path '*/.svn/*' -exec \
-        ${sed_i_cmd} \
-        "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