More SHARED_DIR changes

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@489 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/firewall

@@ -4311,6 +4311,10 @@ do_initialize() {
 	startup_error "$FUNCTIONS does not exist!"
     fi
 
+    VERSION_FILE=$SHARED_DIR/version
+
+    [ -f $VERSION_FILE ] && version=`cat $VERSION_FILE`
+
     run_user_exit params
 
     config=`find_file shorewall.conf`
@@ -4323,10 +4327,6 @@ do_initialize() {
 	exit 2
     fi
 
-    VERSION_FILE=$SHARED_DIR/version
-
-    [ -f $VERSION_FILE ] && version=`cat $VERSION_FILE`
-
     [ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall
 
     [ -d $STATEDIR ] || mkdir -p $STATEDIR

Shorewall/shorewall

@@ -571,24 +571,11 @@ fi
 [ -n "$SHOREWALL_DIR" ] && export SHOREWALL_DIR
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
-SHARED_DIR=/usr/share/shorewall
 MUTEX_TIMEOUT=
 
-if [ -n "$SHOREWALL_DIR" -a -f $SHOREWALL_DIR/shorewall.conf ]; then
-    config=$SHOREWALL_DIR/shorewall.conf
-else
-    config=/etc/shorewall/shorewall.conf
-fi
-
-if [ -f $config ]; then
-    . $config
-else
-    echo "$config does not exist!" >&2
-    exit 2
-fi
-
 [ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall
 
+SHARED_DIR=/usr/share/shorewall
 FIREWALL=$SHARED_DIR/firewall
 FUNCTIONS=$SHARED_DIR/functions
 VERSION_FILE=$SHARED_DIR/version
@@ -600,6 +587,15 @@ else
     exit 2
 fi
 
+config=`find_file shorewall.conf`
+
+if [ -f $config ]; then
+    . $config
+else
+    echo "$config does not exist!" >&2
+    exit 2
+fi
+
 if [ ! -f $FIREWALL ]; then
     echo "ERROR: Shorewall is not properly installed"
     if [ -L $FIREWALL ]; then