From 073b2992cc96f8258774bfd3cccabcab79100884 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 31 Oct 2015 12:43:01 -0700 Subject: [PATCH] Require the 'install' utility in the installers Signed-off-by: Tom Eastep --- Shorewall-core/install.sh | 2 ++ Shorewall-lite/install.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh index e9643850c..253af810b 100755 --- a/Shorewall-core/install.sh +++ b/Shorewall-core/install.sh @@ -133,6 +133,8 @@ while [ $finished -eq 0 ]; do esac done +[ -n $(mywhich install) ] || { fatal_error "This installer requires the 'install' utility" + # # Read the RC file # diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 0c6d8cc0e..6f5f3fb1d 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -151,6 +151,8 @@ while [ $finished -eq 0 ] ; do esac done +[ -n $(mywhich install) ] || { fatal_error "This installer requires the 'install' utility" + # # Read the RC file # @@ -187,7 +189,7 @@ elif [ -z "${VARDIR}" ]; then VARDIR=${VARLIB}/${PRODUCT} fi -for var in SHAREDIR LIBEXECDIRDIRDIR CONFDIR SBINDIR VARLIB VARDIR; do +for var in SHAREDIR LIBEXECDIR CONFDIR SBINDIR VARLIB VARDIR; do require $var done