Merge pull request #1 from junkblocker/master

Added support for Darwin, some interaction improvement, and style lint

syncthing-resolve-conflicts.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 
 # Check for sync conflicts and resolve them.  Idea from the shell
 # script 'pacdiff'.
@@ -13,36 +13,55 @@ declare -a nontext
 
 plain() {
     (( QUIET )) && return
-	local mesg=$1; shift
+    local mesg
+    mesg="$1"; shift
     printf "    ${mesg}${ALL_OFF}\n" "$@" >&1
 }
 
 msg() {
     (( QUIET )) && return
-	local mesg=$1; shift
+    local mesg
+    mesg="$1"; shift
+    # shellcheck disable=SC2059
     printf "${GREEN}==>${ALL_OFF} ${mesg}${ALL_OFF}\n" "$@" >&1
 }
 
 msg2() {
     (( QUIET )) && return
-	local mesg=$1; shift
+    local mesg
+    mesg="$1"; shift
+    # shellcheck disable=SC2059
     printf "${BLUE} ->${ALL_OFF} ${mesg}${ALL_OFF}\n" "$@" >&1
 }
 
 ask() {
-	local mesg=$1; shift
+    local mesg
+    mesg="$1"; shift
+    # shellcheck disable=SC2059
     printf " ${BLUE}::${ALL_OFF} ${mesg}${ALL_OFF}" "$@" >&1
 }
 
+if [ -n "$(command -v gettext)" ]; then
+    translate() {
+        gettext "$@"
+    }
+else
+    translate() {
+        printf %s "$@"
+    }
+fi
 warning() {
-	local mesg=$1; shift
+    local mesg
-    echo
+    mesg="$1"; shift
-	printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF} ${mesg}${ALL_OFF}\n" "$@" >&2
+    # shellcheck disable=SC2059
+    printf "\n${YELLOW}==> $(translate "WARNING:")${ALL_OFF} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
 error() {
-	local mesg=$1; shift
+    local mesg
-	printf "${RED}==> $(gettext "ERROR:")${ALL_OFF} ${mesg}${ALL_OFF}\n" "$@" >&2
+    mesg="$1"; shift
+    # shellcheck disable=SC2059
+    printf "${RED}==> $(translate "ERROR:")${ALL_OFF} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
 usage() {
@@ -76,7 +95,10 @@ version() {
 }
 
 cmd() {
-	locate -0 -e -b sync-conflict
+    case "$(uname -s)" in
+        Darwin) locate -0 sync-conflict;;
+        *) locate -0 -e -b sync-conflict ;;
+    esac
 }
 
 while [[ -n "$1" ]]; do
@@ -115,7 +137,7 @@ if [[ -t 2 && $USE_COLOR = "y" ]]; then
 fi
 readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
 
-if ! type -p ${diffprog%% *} >/dev/null && (( ! OUTPUTONLY )); then
+if [ -z "$(command -v "${diffprog%% *}")" ] && (( ! OUTPUTONLY )); then
     error "Cannot find the $diffprog binary required for viewing differences."
     exit 1
 fi
@@ -124,6 +146,7 @@ warning "Recursive sync conflicts are not properly handled."
 
 # See http://mywiki.wooledge.org/BashFAQ/020.
 while IFS= read -u 3 -r -d '' conflict; do
+    [[ ! -e "$conflict" && ! -L "$conflict" && ! -d "$conflict" ]] && continue
     if (( OUTPUTONLY )); then
         echo "$conflict"
         continue
@@ -139,7 +162,7 @@ while IFS= read -u 3 -r -d '' conflict; do
     # XXX: Maybe somebody wants to diff special non-text files?
 
     # Ignore binary files.
-    if [[ -z $(file -i "$conflict" | grep text) ]]
+    if file -i "$conflict" | grep -qv text
     then
         nontext+=("$conflict")
         continue
@@ -152,8 +175,7 @@ while IFS= read -u 3 -r -d '' conflict; do
 
     # Original filename.
     file="${conflict/.sync-conflict-????????-??????/}"
-
+    msg "Sync conflict: %s" "$conflict"
-	msg "Sync conflict found: %s" "$conflict"
     # Handle sync conflict if original file exists.
     if [ ! -f "$file" ]
     then
@@ -163,11 +185,15 @@ while IFS= read -u 3 -r -d '' conflict; do
     fi
     msg2 "Original file: %s" "$file"
 
-	if cmp -s "$conflict" "$file"; then
+    if test "$conflict" -ef "$file"; then
+        warning "Original file and conflict file point to the same file. Ignoring conflict."
+        continue
+    elif cmp -s "$conflict" "$file"; then
         msg2 "Files are identical, removing..."
         plain "$(rm -v "$conflict")"
     else
         ask "(V)iew, (S)kip, (R)emove sync conflict, (O)verwrite with sync conflict, (Q)uit: [v/s/r/o/q] "
+        # shellcheck disable=SC2162
         while read c; do
             case $c in
                 q|Q) exit 0;;
@@ -190,10 +216,27 @@ if [ ! ${#ignored[@]} -eq 0 ]
 then
     warning "Some files have been ignored."
     (( ${#ignored[@]} )) && msg "%s" "${ignored[@]}"
-    ask "(R)emove ignored files, (Q)uit: [r/q] "
+    ask "(R)emove all ignored files, (A)sk for each file, (Q)uit: [r/q] "
+    # shellcheck disable=SC2162
     while read c; do
-        case $c in
+        case "$c" in
+            q|Q) exit 0 ;;
+            a|A)
+                for f in "${ignored[@]}"
+                do
+                    msg "Ignored file: %s" "$f"
+                    ask "(R)emove, (S)kip, (Q)uit: [r/s/q] "
+                    # shellcheck disable=SC2162
+                    while read ci; do
+                        case "$ci" in
                             q|Q) exit 0 ;;
+                            s|S) break ;;
+                            r|R) plain "$(rm -v "$f")"; break ;;
+                            *) ask "Invalid answer.  Try again: [r/s/q] "; continue ;;
+                        esac
+                    done
+                done
+                ;;
             r|R) (( ${#ignored[@]} )) && plain "$(rm -v "${ignored[@]}")"; break ;;
             *) ask "Invalid answer.  Try again: [d/q] "; continue ;;
         esac
@@ -204,13 +247,14 @@ fi
 # delete them one by one if specified.
 if [ ! ${#nontext[@]} -eq 0 ]
 then
-    warning "Some files that are not text have been ignored."
+    warning "The following files that are non-text:"
     for f in "${nontext[@]}"
     do
-        msg "%s" "$f"
+        msg "Non-text file: %s" "$f"
         ask "(R)emove, (S)kip, (Q)uit: [r/s/q] "
+        # shellcheck disable=SC2162
         while read c; do
-            case $c in
+            case "$c" in
                 q|Q) exit 0 ;;
                 s|S) break ;;
                 r|R) plain "$(rm -v "$f")"; break ;;