summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2016-11-04 16:03:46 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2016-11-04 16:03:46 +0000
commitba50086d387a9271c3975d49e9700d931d18abb8 (patch)
treea89dda365a72dc795e7f4dab936ef66656f275d1 /usr.sbin
parent07f2e95ff0394789a5b8aa6b2b6dee0b26f48c17 (diff)
Be verbose when PATCH_PATH is not set (that is temporary until we agree on
a way to point to a syspatch mirror).
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/syspatch/syspatch.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh
index f5c0489e1a8..2d752370158 100644
--- a/usr.sbin/syspatch/syspatch.sh
+++ b/usr.sbin/syspatch/syspatch.sh
@@ -1,6 +1,6 @@
#!/bin/ksh
#
-# $OpenBSD: syspatch.sh,v 1.38 2016/11/04 15:32:13 ajacoutot Exp $
+# $OpenBSD: syspatch.sh,v 1.39 2016/11/04 16:03:45 ajacoutot Exp $
#
# Copyright (c) 2016 Antoine Jacoutot <ajacoutot@openbsd.org>
#
@@ -78,7 +78,6 @@ apply_patches()
checkfs()
{
- # XXX make sure we have enough space?
local _files="${@}"
[[ -n ${_files} ]]
@@ -261,9 +260,9 @@ set -A _KERNV -- $(sysctl -n kern.version |
[[ $@ == @(|-[[:alpha:]]) ]] || usage
# XXX to be discussed; check for $ARCH?
-[[ -n ${PATCH_PATH} ]]
[[ -d ${PATCH_PATH} ]] && PATCH_PATH="file://$(readlink -f ${PATCH_PATH})"
-[[ ${PATCH_PATH:%%://*} == @(file|ftp|http|https) ]]
+[[ ${PATCH_PATH:%%://*} == @(file|ftp|http|https) ]] ||
+ sp_err "No valid PATCH_PATH set"
[[ $(sysctl -n hw.ncpufound) -gt 1 ]] && _BSDMP=true || _BSDMP=false
_FETCH="/usr/bin/ftp -MVk ${FTP_KEEPALIVE-0}"