diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-07-05 21:43:46 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-07-05 21:43:46 +0000 |
| commit | b7918935fd87cb9e0e64fff384601d064f241ba6 (patch) | |
| tree | 79c22cf09bc3d8bf25b25540ef5937f7d5336104 | |
| parent | 64ebb1a65aa218f28da6862696ff1a16bb779088 (diff) | |
Make it possible to pass https:// and file:// (along with ftp:// and
http://) so that sysmerge(8) can work with URLs we use in the install
script.
ok sthen@
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index fefe186fde0..ebd1f56d7d6 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.74 2011/05/09 14:18:34 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.75 2011/07/05 21:43:45 ajacoutot Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009, 2010, 2011 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -665,7 +665,7 @@ while getopts bds:x: arg; do tar tzf ${OPTARG} ./var/db/sysmerge/etcsum > /dev/null 2>&1 ; then TGZ=${OPTARG} elif echo ${OPTARG} | \ - grep -qE '^(http|ftp)://.*/etc[0-9][0-9]\.tgz$'; then + grep -qE '^(file|ftp|http|https)://.*/etc[0-9][0-9]\.tgz$'; then TGZ=${WRKDIR}/etc.tgz TGZURL=${OPTARG} if ! ${FETCH_CMD} -o ${TGZ} ${TGZURL}; then @@ -682,7 +682,7 @@ while getopts bds:x: arg; do tar tzf ${OPTARG} ./var/db/sysmerge/xetcsum > /dev/null 2>&1 ; then \ XTGZ=${OPTARG} elif echo ${OPTARG} | \ - grep -qE '^(http|ftp)://.*/xetc[0-9][0-9]\.tgz$'; then + grep -qE '^(file|ftp|http|https)://.*/xetc[0-9][0-9]\.tgz$'; then XTGZ=${WRKDIR}/xetc.tgz XTGZURL=${OPTARG} if ! ${FETCH_CMD} -o ${XTGZ} ${XTGZURL}; then |