X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=appendu;h=460e363fd0223ad88718581cb7d3630da84fef58;hb=ff367964d27678cbbc93aff541e3b45274919668;hp=792ffce882618a8c2d96d702425f7175301f3644;hpb=1a845d1b8d9e48872cdbf3c6360db52b70b6479a;p=tee-unique

diff --git a/appendu b/appendu
index 792ffce..460e363 100755
--- a/appendu
+++ b/appendu
@@ -47,6 +47,17 @@ LINE_SETs are treated the same.
             return 1
         fi
     fi
+
+    local strings line
+    if (( $# == 0 )); then
+        unset IFS
+        while read -r line; do
+            strings+=( "$line" )
+        done
+    else
+        strings=( "$@" )
+    fi
+
     if ! $new_file; then
         if [[ ! -r $file ]]; then
             echo "appendu error: cannot read or write $file"
@@ -56,30 +67,21 @@ LINE_SETs are treated the same.
             echo "appendu error: cannot read or write $file"
             return 1
         fi            
-    fi
-
-    local strings
-    if (( $# == 0 )); then
-        unset IFS
-        while read -r x; do
-            strings+=( "$x" )
-        done
-    else
-        strings=( "$@" )
-    fi
-
-    if $new_file; then
         # fix files with no newline at the end.
         # the following command won't work right on them otherwise.
         # e = run script, $a\ means append following text, but there is none,
         # so sed only does what it always does when it was supposed to modify a file,
         # which is append a newline if there was none.
-        sed -ie '$a\' "$file"
+        sed -i '$a\' "$file"
         # command substitution removes any trailing newlines, so we have to add
         # a non-newline ending, we randomly chose "b", then remove it.
-        local content=$(cat "$file"; echo b) content=${content%b}
+        local content=$(cat "$file"; echo b)
+        content=${content%b}
     fi
     
+    local reset_extglob=false
+    ! shopt extglob >/dev/null && reset_extglob=true
+    shopt -s extglob
     # we aren't using regex because we want to match strings,
     # but we also want our match to start at the beginning of a line,
     # or the beginning of the file, and to end at a line ending.
@@ -98,6 +100,7 @@ LINE_SETs are treated the same.
             fi
         fi
     done
+    $reset_extglob && shopt -u extglob 
     return 0
 }
 appendu "$@"