diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-08-21 16:50:12 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-08-21 16:50:12 +0000 |
| commit | 08d02373b8b3df4227018da64af2d271880b79ab (patch) | |
| tree | 91296f742a8b42a1e342d5d0b4643b60bc0edcdc /usr.sbin/sysmerge | |
| parent | 448de5b7f344f80a08537df33d9bfa6ab8a50ff7 (diff) | |
Unbreak when "SRCDIR=."
reported by phessler@
Diffstat (limited to 'usr.sbin/sysmerge')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 269dcc90320..bc9850acf19 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.150 2014/08/11 09:03:27 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.151 2014/08/21 16:50:11 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -853,7 +853,7 @@ while getopts bdpSs:x: arg; do usage error_rm_wrkdir "conflicting options" fi - SRCDIR="${OPTARG}" + SRCDIR="$(readlink -f ${OPTARG})" [[ -f ${SRCDIR}/etc/Makefile ]] || \ error_rm_wrkdir "${SRCDIR}: invalid \"src\" tree, missing ${SRCDIR}/etc/Makefile" continue |