X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=inline;f=scripts%2Fcore%2Ffunctions.sh;h=daaabcb16cece5a745d7735421fbecfc1c4691f3;hb=2c725838e22747dd922163daf376ea2b81395c5e;hp=8f35a5557a2698e5e6fca79f206ff40722abc338;hpb=85738d09dddc4cb41810865709a263e16250ed4a;p=feisty_meow.git

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 8f35a555..daaabcb1 100644
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -478,7 +478,11 @@ if [ -z "$skip_all" ]; then
     fi
 
     # prevent permission foul-ups.
-    chown -R "$(logname):$(logname)" "$FEISTY_MEOW_LOADING_DOCK"/* "$FEISTY_MEOW_GENERATED_STORE"/*
+#hmmm: save error output here instead of muting it.
+#hmmm: better yet actually, just don't complain on freaking cygwin, since that's where this happens
+    chown -R "$(logname):$(logname)" \
+        "$FEISTY_MEOW_LOADING_DOCK"/* "$FEISTY_MEOW_GENERATED_STORE"/* 2>/dev/null
+    test_or_continue "chowning to $(logname) didn't happen."
 
     regenerate >/dev/null
     pushd "$FEISTY_MEOW_LOADING_DOCK/custom" &>/dev/null
@@ -510,7 +514,9 @@ if [ -z "$skip_all" ]; then
     regenerate
 
     # prevent permission foul-ups, again.
-    chown -R "$(logname):$(logname)" "$FEISTY_MEOW_LOADING_DOCK" "$FEISTY_MEOW_GENERATED_STORE"
+    chown -R "$(logname):$(logname)" \
+        "$FEISTY_MEOW_LOADING_DOCK" "$FEISTY_MEOW_GENERATED_STORE" 2>/dev/null
+    test_or_continue "chowning to $(logname) didn't happen."
 
     restore_terminal_title
   }
@@ -864,11 +870,11 @@ 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}" 
+    \cp -f "$filename" "/tmp/$(basename ${filename}).bkup-${RANDOM}" 
     test_or_die "backing up file: $filename"
 
     # make a temp file to write to before we move file into place in bind.
@@ -878,6 +884,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 +895,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,15 +909,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:
-filedump "$new_version"
+#echo file we created looks like this:
+#cat "$new_version"
 
-echo bailing
-exit 1
-
-    \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
   }
 
   ##############