X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=appendu;h=feb58d4ee5b283902f189088d2cae823eeaaf556;hb=27a02f00b4498bf7b1519f36d73a634c81710957;hp=c7455dccdbe43be08e1b5f858f8ef2db7f8f0fcc;hpb=7ca836a05e81aeac0758b10d220e4b618c854ea8;p=tee-unique

diff --git a/appendu b/appendu
index c7455dc..feb58d4 100755
--- a/appendu
+++ b/appendu
@@ -3,16 +3,19 @@
 # This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
 
 appendu() {
-    local help="Usage: appendu [OPTION]... FILE [LINE]...
+    local help="Usage: appendu [OPTION]... FILE [LINE_SET]...
+
 Append unique.
-Append each line to FILE if it does not exist in FILE.
-Use LINE if specified, else use lines from stdin.
-Appended lines are output to the terminal.
+
+A LINE_SET is one or more lines. Append LINE_SET to FILE if it does not exist in
+FILE.  If no LINE_SET argument is given, read lines from stdin, and treat each
+as a single LINE_SET. Appended text is output to the terminal.
 
   -s      don't try to use sudo when it would help us read or write the file
   --      stop processing arguments
   --help  display this message"
 
+    local readsudo writesudo x strings string content
     local dosudo=true
     
     while true; do
@@ -36,36 +39,64 @@ Appended lines are output to the terminal.
         return 1
     fi
 
-    local readsudo writesudo
     local file="$1"
     shift
-    
+
+    local file_exists=false
     if [[ -e $file ]]; then
+        file_exists=true
         [[ -r $file ]] || readsudo=sudo
         [[ -w $file ]] || writesudo=sudo
-    else 
+    else
         local dir="$(dirname "$file")"
         if [[ -d $dir ]]; then
             [[ ! -w $dir ]] && writesudo=sudo
         else
             echo "appendu error: $dir does not exist"
-            exit 1
+            return 1
         fi
     fi
     if ! $dosudo; then
         readsudo=
         writesudo=
     fi
-    if [[ $@ ]]; then
-        for x in "$@"; do
-            [[ -e "$file" ]] && $readsudo grep -q "^$x$" "$file" || $writesudo tee -a "$file"<<<"$x"
-        done
-    elif [[ ! -t 0 ]]; then
+    
+    if (( $# == 0 )); then
         unset IFS
         while read -r x; do
-            # duplicated from above
-            [[ -e "$file" ]] && $readsudo grep -q "^$x$" "$file" || $writesudo tee -a "$file"<<<"$x"
+            strings+=( "$x" )
+        done
+    else
+        strings=( "$@" )
+    fi
+
+    if $file_exists; then
+        # fix files with no newline at the end.
+        # the following command won't work right on them.
+        # 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"
+        # command substitution removes any trailing newlines, so we have to add
+        # a non-newline ending, we randomly chose "b", then remove it.
+        content=$($readsudo cat "$file"; echo b) content=${content%b}
+        
+        # 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.
+        # So we do some slick bash to match this.
+        local start="?(*
+)"
+        local end="
+*"
+        for string in "${strings[@]}"; do
+            [[ $content != $start"$string"$end ]] && $writesudo tee -a "$file"<<<"$string"
+        done
+    else
+        for string in "${strings[@]}"; do
+            $writesudo tee -a "$file"<<<"${strings[@]}"
         done
     fi
+    return 0
 }
 appendu "$@"