diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh index 4cb67e648..2a8ded99b 100755 --- a/Shorewall-core/install.sh +++ b/Shorewall-core/install.sh @@ -137,12 +137,12 @@ done # Read the RC file # if [ $# -eq 0 ]; then - if [ -f ~/.shorewallrc ]; then - . ~/.shorewallrc + if [ -f ./shorewallrc ]; then + . ./shorewallrc file=~/.shorewallrc elif [ -f ./.shorewallrc ]; then - . ./.shorewallrc || exit 1 - file=./.shorewallrc + . ~/.shorewallrc || exit 1 + file=~/.shorewallrc elif [ -f /usr/share/shorewall/shorewallrc ]; then . /usr/share/shorewall/shorewallrc file=/usr/share/shorewall/shorewallrc diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 6178d2991..f0e7f781f 100755 --- a/Shorewall-init/install.sh +++ b/Shorewall-init/install.sh @@ -136,11 +136,11 @@ if [ $# -eq 0 ]; then # # Load packager's settings if any # - if [ -f ~/.shorewallrc ]; then - . ~/.shorewallrc || exit 1 + if [ -f ./shorewallrc ]; then + . ./shorewallrc || exit 1 file=~/.shorewallrc - elif [ -f ./.shorewallrc ]; then - . ./.shorewallrc || exit 1 + elif [ -f ~/.shorewallrc ]; then + . ~/.shorewallrc || exit 1 file=./.shorewallrc else fatal_error "No configuration file specified and ~/.shorewallrc not found" diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 0a3327fe5..ff504e544 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -146,11 +146,11 @@ done # Read the RC file # if [ $# -eq 0 ]; then - if [ -f ~/.shorewallrc ]; then + if [ -f ./shorewallrc ]; then + . ./shorewallrc || exit 1 + file=./shorewallrc + elif [ -f ~/.shorewallrc ]; then . ~/.shorewallrc - elif [ -f ./.shorewallrc ]; then - . ./.shorewallrc || exit 1 - file=./.shorewallrc elif [ -f /usr/share/shorewall/shorewallrc ]; then . /usr/share/shorewall/shorewallrc else @@ -362,7 +362,7 @@ if [ -n "$INITFILE" ]; then [ "${SHAREDIR}" = /usr/share ] || eval sed -i \'s\|/usr/share/|${SHAREDIR}/|\' "$initfile" - echo "$Product init script installed in ${DESTDIR}${INITDIR}/${INITFILE}" + echo "$Product init script installed in $initfile" fi # # Install the .service file diff --git a/Shorewall/install.sh b/Shorewall/install.sh index f4f6e4fa5..c4e5c46b0 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -168,10 +168,10 @@ done # Read the RC file # if [ $# -eq 0 ]; then - if [ -f ~/.shorewallrc ]; then - . ~/.shorewallrc - elif [ -f ./.shorewallrc ]; then - . ./.shorewallrc || exit 1 + if [ -f ./shorewallrc ]; then + . ./shorewallrc + elif [ -f ~/.shorewallrc ]; then + . ~/.shorewallrc || exit 1 file=./.shorewallrc elif [ -f /usr/share/shorewall/shorewallrc ]; then . /usr/share/shorewall/shorewallrc