Changeset 491 for trunk

Timestamp:

11/11/2009 15:59:06 (3 years ago)

Author:

ccowart

Message:

Defining $sed_i_cmd that deals with OS-specific logic for whether
-i must take a flag and whether it should be a separate shell word. Also
making the use of ${sed_cmd} consistent (there were some occurrences of
sed without the variable wrapper).

Fixes #98

Location:

trunk

Files:

• confman.in (modified) (2 diffs)
• confmancommon.sh.in (modified) (3 diffs)
• confmanlib.sh.in (modified) (4 diffs)

trunk/confman.in

@@ -157 +157 @@
     done
     rm -f "$orig_log"
-    ${sed_cmd} -i '' -e "/${ignoreline}/,\$d" "$logfile" 2>/dev/null
+    ${sed_i_cmd} -e "/${ignoreline}/,\$d" "$logfile" 2>/dev/null
     echo "$logfile"
     return 0
@@ -529 +529 @@
     realpath=${dir#${WORK_PATH}/${module}}
     
-    local directories=`echo "$realpath" | sed 's:/: :g'`
+    local directories=`echo "$realpath" | ${sed_cmd} -e 's:/: :g'`
     local fulldir=""
     

trunk/confmancommon.sh.in

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

trunk/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
 
@@ -859 +859 @@
 
     find ${WORK_PATH}/${newmod} -type f -not -path '*/.svn/*' -exec \
-        ${sed_cmd} -i"" \
+        ${sed_i_cmd} \
         "s/(Managed under )${oldmod}( module\.)$/\1${newmod}\2/" {} \; \
         || return 1