diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-09-07 08:15:42 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-09-07 08:15:42 +0000 |
| commit | ccaabe13d8d5bd7b37155f93434dee1c930adcdb (patch) | |
| tree | bf595a53bcabff032b54ee254a52907a43afc9c8 | |
| parent | Use shell substitution instead of dirname. (diff) | |
| download | wireguard-openbsd-ccaabe13d8d5bd7b37155f93434dee1c930adcdb.tar.xz wireguard-openbsd-ccaabe13d8d5bd7b37155f93434dee1c930adcdb.zip | |
Fix regression in detecting changed files.
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 8488933e8a7..efd06bf5190 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.178 2014/09/07 07:46:26 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.179 2014/09/07 08:15:42 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -272,11 +272,12 @@ sm_init() { rm ${COMPFILE} && continue fi - _diff=$(diff -q ${TARGET} ${COMPFILE} 2>&1 | head -1) + _diff=$(diff -q ${TARGET} ${COMPFILE} 2>&1) # files are the same: delete [[ $? -eq 0 ]] && rm ${COMPFILE} && continue # disable sdiff for binaries - grep -q "Binary files" "${_diff}" && IS_BINFILE=true + echo "${_diff}" | head -1 | grep -q "Binary files" && \ + IS_BINFILE=true else # missing files = binaries (to avoid comparison) IS_BINFILE=true |