working version

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 8772dfdc0d6b0cdc66e6d228b4f4d374b6182584..dee26d6b4fae1a78dcb624508f631b1653960041 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -864,8 +864,8 @@ return 0
     local seeker="$1"; shift
     local numlines=$1; shift
 
-echo into create_chomped_copy...
-var filename seeker numlines 
+#echo into create_chomped_copy...
+#var filename seeker numlines 
 
     # make a backup first, oy.
     \cp -f "$filename" "$filename.bkup-${RANDOM}" 
@@ -878,6 +878,7 @@ var filename seeker numlines
 
     local line
     local skip_count=0
+    local found_any=
     while read line; do
       # don't bother looking at the lines if we're already in skip mode.
       if [[ $skip_count == 0 ]]; then
@@ -888,12 +889,13 @@ var filename seeker numlines
         else
           # a match!  start skipping.  we will delete this line and the next N lines.
           ((skip_count++))
-echo first skip count is now $skip_count
+#echo first skip count is now $skip_count
+          found_any=yes
         fi
       else
         # we're already skipping.  let's keep going until we hit the limit.
         ((skip_count++))
-echo ongoing skip count is now $skip_count
+#echo ongoing skip count is now $skip_count
         if (( $skip_count > $numlines )); then
           echo "Done skipping, and back to writing output file."
           skip_count=0
@@ -901,12 +903,17 @@ echo ongoing skip count is now $skip_count
       fi
     done < "$filename"
 
-#put the file back into place.
-echo file we created looks like this:
-cat "$new_version"
+#echo file we created looks like this:
+#cat "$new_version"
 
-    \mv "$new_version" "$filename"
-    test_or_die "moving the new version into place in: $filename"
+    if [ ! -z "$found_any" ]; then
+      # put the file back into place under the original name.
+      \mv "$new_version" "$filename"
+      test_or_die "moving the new version into place in: $filename"
+    else
+      # cannot always be considered an error, but we can at least gripe.
+      echo "Did not find any matches for seeker '$seeker' in file: $filename"
+    fi
   }
 
   ##############

diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh
index af0cf3db545ed0038385aa5497fc71c3d8c6d6a1..078f241968d71d96d3b0bdde764da0b316d483b4 100644 (file)
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@ -14,6 +14,8 @@ function remove_domain_file()
     # don't destroy, just shuffle.
     \mv -f "$domain_file" "/tmp/$(basename ${domain_file})-old-${RANDOM}"
     test_or_die "removing domain file: $domain_file"
+  else
+    echo "Did not see a domain file to remove: $domain_file"
   fi
 }