diff options
| author |   pyr <pyr@openbsd.org> | 2008-06-10 00:36:46 +0000 |
|---|---|---|
| committer | pyr <pyr@openbsd.org> | 2008-06-10 00:36:46 +0000 |
| commit | 68bd425cc3159f0fe60e5b8c0fa6198b3b0057fc (patch) | |
| tree | 9cfa8f73e0e77ddd3a81e8f42f2ae6ca7d4dd91c | |
| parent | correctly setup the tty line for NMEA devices, especially turn off echo (diff) | |
| download | wireguard-openbsd-68bd425cc3159f0fe60e5b8c0fa6198b3b0057fc.tar.xz wireguard-openbsd-68bd425cc3159f0fe60e5b8c0fa6198b3b0057fc.zip | |
Additionnal checks on the file names supplied for -s and -x.
Based on a diff by ajacoutot@, ok jdixon@ and sthen@ on a previous diff,
ok ajacoutot@.
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 829fda2482f..f08e18bcf8d 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.11 2008/06/09 23:57:58 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.12 2008/06/10 00:36:46 pyr Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton <DougB@FreeBSD.org> @@ -439,7 +439,9 @@ do shift 2 if [ -f "${WHERE}/etc/Makefile" ]; then SRCDIR=${WHERE} - elif [ -f "${WHERE}" -a "`echo ${WHERE} | sed -e 's,.*\/,,g'`" = etc??.tgz ]; then + elif [ -f "${WHERE}" ] && echo -n ${WHERE} | \ + awk -F/ '{print $NF}' | \ + grep '^etc[0-9][0-9]\.tgz$' > /dev/null 2>&1 ; then TGZ=${WHERE} else echo " *** ERROR: ${WHERE} is not a path to src nor etcXX.tgz" @@ -449,7 +451,9 @@ do -x) WHERE="${2}" shift 2 - if [ -f "${WHERE}" -a "`echo ${WHERE} | sed -e 's,.*\/,,g'`" = xetc??.tgz ]; then + if [ -f "${WHERE}" ] && echo -n ${WHERE} | \ + awk -F/ '{print $NF}' | \ + grep '^xetc[0-9][0-9]\.tgz$' > /dev/null 2>&1 ; then XTGZ=${WHERE} else echo " *** ERROR: ${WHERE} is not a path to xetcXX.tgz" |