diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-09-09 09:44:32 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-09-09 09:44:32 +0000 |
| commit | 3244419db304df54c72d39f8cb719f4b866e31e6 (patch) | |
| tree | 57d8626d5373d1f624f30e3cbf16296c1edb5782 /usr.sbin/sysmerge | |
| parent | abfd040df23996e22732406201f416b5a77c2855 (diff) | |
Remove more dead code.
Diffstat (limited to 'usr.sbin/sysmerge')
| -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 |