diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2015-09-09 09:44:31 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2015-09-09 09:44:31 +0000 |
| commit | 6956316971fedc32f63a1c94e3a1ee84d5ada687 (patch) | |
| tree | ba31039d88f48f0c8e75a0cac8d42e181de14948 /usr.sbin/sysmerge/sysmerge.sh | |
| parent | Now that ld(1) will generate a read-only GOT for truly static binaries, we (diff) | |
| download | wireguard-openbsd-6956316971fedc32f63a1c94e3a1ee84d5ada687.tar.xz wireguard-openbsd-6956316971fedc32f63a1c94e3a1ee84d5ada687.zip | |
Remove more dead code.
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.sh')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 91e44a3088e..ddc4ffaad2c 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.206 2015/09/09 08:10:33 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.207 2015/09/09 09:44:31 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -507,21 +507,17 @@ sm_diff_loop() { echo if ${IS_LINK}; then echo "===> Linking ${TARGET}" - sm_install && \ - MERGED_FILES="${MERGED_FILES}${TARGET}\n" || \ + sm_install || \ sm_warn "problem creating ${TARGET} link" else echo -n "===> Updating ${TARGET}" - sm_install && \ - MERGED_FILES="${MERGED_FILES}${TARGET}\n" || \ + sm_install || \ (echo && sm_warn "problem updating ${TARGET}") fi ;; [mM]) if ! ${_nonexistent} && ! ${IS_BIN} && ! ${IS_LINK}; then - sm_merge_loop && \ - MERGED_FILES="${MERGED_FILES}${TARGET}\n" || \ - _handle=todo + sm_merge_loop || _handle=todo else echo "invalid choice: ${_handle}\n" _handle=todo |