diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2015-09-09 08:10:33 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2015-09-09 08:10:33 +0000 |
| commit | 7bcba792b83f6a8a99893a73f1c525bcf03404ba (patch) | |
| tree | ace06b60d72f07a09e63c459713585c92455efa5 /usr.sbin/sysmerge | |
| parent | Move and tweak a comment. (diff) | |
| download | wireguard-openbsd-7bcba792b83f6a8a99893a73f1c525bcf03404ba.tar.xz wireguard-openbsd-7bcba792b83f6a8a99893a73f1c525bcf03404ba.zip | |
Remove unused code.
Diffstat (limited to 'usr.sbin/sysmerge')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 149e0b0644f..91e44a3088e 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.205 2015/09/09 08:04:22 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.206 2015/09/09 08:10:33 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -430,7 +430,7 @@ sm_merge_loop() { } sm_diff_loop() { - local i _handle _nonexistent _autoinst + local i _handle _nonexistent ${BATCHMODE} && _handle=todo || _handle=v @@ -449,8 +449,7 @@ sm_diff_loop() { if [[ -z $(diff -q -I'[$]OpenBSD:.*$' ${TARGET} ${COMPFILE}) ]] || \ ${FORCE_UPG} || ${IS_BIN}; then echo -n "===> Updating ${TARGET}" - sm_install && \ - _autoinst="${_autoinst}${TARGET}\n" || \ + sm_install || \ (echo && sm_warn "problem updating ${TARGET}") return fi @@ -471,14 +470,12 @@ sm_diff_loop() { ${BATCHMODE} || echo "\n===> Missing ${TARGET}\n" elif ${IS_LINK}; then echo "===> Linking ${TARGET}" - sm_install && \ - _autoinst="${_autoinst}${TARGET}\n" || \ + sm_install || \ sm_warn "problem creating ${TARGET} link" return else echo -n "===> Installing ${TARGET}" - sm_install && \ - _autoinst="${_autoinst}${TARGET}\n" || \ + sm_install || \ (echo && sm_warn "problem installing ${TARGET}") return fi |