From b9221777696817cd7236b7bb48a35d64c5c2efe1 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 2 Sep 2012 15:51:35 -0700
Subject: [PATCH] Handle missing VARDIR

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-core/install.sh | 2 ++
 Shorewall-core/lib.base   | 2 ++
 Shorewall-init/install.sh | 2 ++
 Shorewall-lite/install.sh | 2 ++
 Shorewall/install.sh      | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh
index 0ad939d33..6263ef7b1 100755
--- a/Shorewall-core/install.sh
+++ b/Shorewall-core/install.sh
@@ -167,6 +167,8 @@ fi
 if [ -z "${VARLIB}" ]; then
     VARLIB=${VARDIR}
     VARDIR='${VARLIB}/${PRODUCT}'
+elif [ -z "${VARDIR}" ]; then
+    VARDIR='${VARLIB}/${PRODUCT}'
 fi
 
 for var in SHAREDIR LIBEXECDIR PERLLIBDIR CONFDIR SBINDIR VARLIB VARDIR; do
diff --git a/Shorewall-core/lib.base b/Shorewall-core/lib.base
index 1d3398155..608889255 100644
--- a/Shorewall-core/lib.base
+++ b/Shorewall-core/lib.base
@@ -78,6 +78,8 @@ esac
 if [ -z "${VARLIB}" ]; then
     VARLIB=${VARDIR}
     VARDIR=${VARLIB}/$g_program
+elif [ -z "${VARDIR}" ]; then
+    VARDIR='${VARLIB}/${PRODUCT}'
 fi
 
 #
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index c957cab4f..4f9d97420 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -163,6 +163,8 @@ fi
 if [ -z "${VARLIB}" ]; then
     VARLIB=${VARDIR}
     VARDIR='${VARLIB}/${PRODUCT}'
+elif [ -z "${VARDIR}" ]; then
+    VARDIR='${VARLIB}/${PRODUCT}'
 fi
 
 for var in SHAREDIR LIBEXECDIR CONFDIR SBINDIR VARLIB VARDIR; do
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 20cbfa24c..6a615fb4d 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -174,6 +174,8 @@ fi
 if [ -z "${VARLIB}" ]; then
     VARLIB=${VARDIR}
     VARDIR='${VARLIB}/${PRODUCT}'
+elif [ -z "${VARDIR}" ]; then
+    VARDIR='${VARLIB}/${PRODUCT}'
 fi
 
 for var in SHAREDIR LIBEXECDIRDIRDIR CONFDIR SBINDIR VARLIB VARDIR; do
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 99ae45b04..873d7c517 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -196,6 +196,8 @@ fi
 if [ -z "${VARLIB}" ]; then
     VARLIB=${VARDIR}
     VARDIR='${VARLIB}/${PRODUCT}'
+elif [ -z "${VARDIR}" ]; then
+    VARDIR='${VARLIB}/${PRODUCT}'
 fi
 
 for var in SHAREDIR LIBEXECDIR PERLLIBDIR CONFDIR SBINDIR VARLIB VARDIR; do