Changeset 492 for trunk/confmancommon.sh.in

Timestamp:

11/11/2009 16:37:02 (3 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

File:

• trunk/confmancommon.sh.in (modified) (3 diffs)

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"