diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2009-08-17 12:02:47 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2009-08-17 12:02:47 +0000 |
| commit | c412dc89a1e659c0d3889afaa90edf98e1bb790f (patch) | |
| tree | 9a95b240df05de5526e503a353c91edbfe7ebd77 | |
| parent | also report routers and their host states in relayctl (diff) | |
| download | wireguard-openbsd-c412dc89a1e659c0d3889afaa90edf98e1bb790f.tar.xz wireguard-openbsd-c412dc89a1e659c0d3889afaa90edf98e1bb790f.zip | |
Don't try to move files that don't exist.
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 03c174eae91..6048714525f 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.48 2009/08/16 20:15:10 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.49 2009/08/17 12:02:47 ajacoutot Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -40,7 +40,9 @@ clean_src() { restore_bak() { for i in ${DESTDIR}/${DBDIR}/.*.bak; do _i=`basename ${i} .bak` - mv ${i} ${DESTDIR}/${DBDIR}/${_i#.} + if [ -f "${i}" ]; then + mv ${i} ${DESTDIR}/${DBDIR}/${_i#.} + fi done } |