diff options
Diffstat (limited to 'bin/diffdir')
| -rwxr-xr-x | bin/diffdir | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/diffdir b/bin/diffdir index 57997ed..d1a8ae2 100755 --- a/bin/diffdir +++ b/bin/diffdir @@ -4,8 +4,8 @@ Version='diffdir-0.1' diffdir() { [ -f "/etc/backup/ignore" ] && xf=--exclude-from=/etc/backup/ignore || xf= - rsync -aDSniv $xf --delete $Optx "$2/" "$1" | - awk -v OptF="${OptF#./}" -v prefix=$prefix ' + rsync -aDSnivx "$xf" --delete "$2/" "$1" | + awk -v OptF="${OptF#./}" -v prefix="$prefix" ' NF == 0 {exit} NR < 2 || /\/*\.dv$/ || /\/$/ {next} # Match an itemized status for all versions of rsync -i @@ -15,13 +15,13 @@ diffdir() { key == "*deleting" {print "deleted " prefix file; next} substr(key, 3, 7) == "+++++++" {print "created " prefix file; next} { # Avoid false positive if only mtime is changed. - of = "'$1'/" file; gsub("'\''", "'\'\\\\\'\''", of) - nf = "'$2'/" file; gsub("'\''", "'\'\\\\\'\''", nf) + of = "'"$1"'/" file; gsub("'\''", "'\'\\\\\'\''", of) + nf = "'"$2"'/" file; gsub("'\''", "'\'\\\\\'\''", nf) if (substr(key, 2, 1) == "L") { # Symlink src = target = file sub(/.* -> /, "", target); sub(/ -> .*/, "", src); - "readlink '$2'/" src | getline otarget + "readlink '"$2"'/" src | getline otarget if (target != otarget) print "changed " src } else if (system("cmp -s '\''" of "'\'\ \''" nf "'\''")) @@ -35,7 +35,7 @@ diffdir() { while getopts :V opt; do case $opt in (V) echo "$Version"; exit ;; - (*) echo "Usage: $0 [-V]"; exit 1 ;; + (*) echo "Usage: $0 [-V] old new"; exit 1 ;; esac done shift $((OPTIND - 1)) |