diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-08-31 07:31:26 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-08-31 07:31:26 +0000 |
| commit | 9958e90ebc9b2bcd66b89d2f5ee1f5e9ec0a7631 (patch) | |
| tree | b92c2e1ce72a6efd5455eaf1b2014288396972be | |
| parent | No need to update daemon_flags in the enviroment anymore since the (diff) | |
| download | wireguard-openbsd-9958e90ebc9b2bcd66b89d2f5ee1f5e9ec0a7631.tar.xz wireguard-openbsd-9958e90ebc9b2bcd66b89d2f5ee1f5e9ec0a7631.zip | |
When we are not running in pkg mode, /usr/share/sysmerge/examplessum
should always be part of the temproot, so there's not need to check for its
existence.
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 5cadbc9eb07..0e7255e4a53 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.160 2014/08/31 06:40:46 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.161 2014/08/31 07:31:26 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -215,7 +215,7 @@ sm_populate() { sed -n 's/^+SHA256 (\(.*\)).*/\1/p') for _k in ${_mismatch}; do # skip sum files (!auto-install) - [[ $_k == ./usr/share/sysmerge/${_i} ]] && continue + [[ ${_k} == ./usr/share/sysmerge/${_i} ]] && continue # redirect stderr; file may not exist _cursum=$(cd / && sha256 ${_k} 2>/dev/null) [[ -n $(grep "${_cursum}" /usr/share/sysmerge/${_i}) && \ @@ -641,8 +641,7 @@ sm_check_an_eg() { done sm_warn "example(s) changed for: ${_managed}" fi - [[ -f ${_TMPROOT}/usr/share/sysmerge/examplessum ]] && \ - mv ${_TMPROOT}/usr/share/sysmerge/examplessum \ + mv ${_TMPROOT}/usr/share/sysmerge/examplessum \ /usr/share/sysmerge/examplessum } |