holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Revert "Move ${SBINDIR}/shorewall6 to the Shorewall-core product"

Browse Source 
This reverts commit 1ca886abd7.
This commit is contained in:
Tom Eastep 2020-09-15 16:49:19 -07:00
parent 126c5ccd53
commit 8c10c96844
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
5 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall-core/install.sh
View File

@ -315,7 +315,6 @@ fi
# Install the CLI
#
install_file shorewall ${DESTDIR}${SBINDIR}/shorewall 0755
ln -sf shorewall ${DESTDIR}${SBINDIR}/shorewall6
[ $SHAREDIR = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${SBINDIR}/shorewall
echo "Shorewall CLI program installed in ${DESTDIR}${SBINDIR}/shorewall"
#

16
Shorewall-core/lib.core
View File

@ -71,21 +71,7 @@ setup_product_environment() { # $1 = if non-empty, source shorewallrc again now
;;
esac
if [ ! -f ${SHAREDIR}/${PRODUCT}/version ]; then
if [ $PRODUCT = shorewall6 ]; then
if [ -f ${SHAREDIR}/shorewall6-lite/version ]; then
PRODUCT=shorewall6-lite
g_sharedir="${SHAREDIR}"/shorewall6-lite
g_confdir="${CONFDIR}"/shorewall6-lite
g_product="Shorewall6 Lite"
g_lite=Yes
else
fatal_error "Neither Shorewall6 nor Shorewall6 Lite are installed on this system"
fi
else
fatal_error "$g_product does not appear to be installed on this system"
fi
fi
[ -f ${SHAREDIR}/${PRODUCT}/version ] || fatal_error "$g_product does not appear to be installed on this system"
#
# We need to do this again, now that we have the correct product
#

2
Shorewall-core/uninstall.sh
View File

@ -134,8 +134,6 @@ fi
remove_directory ${SHAREDIR}/shorewall
remove_file ~/.shorewallrc
remove_file ${SBINDIR}/shorewall
remove_file ${SBINDIR}/shorewall6
#
# Report Success

4
Shorewall/install.sh
View File

@ -1087,6 +1087,10 @@ if [ ${PRODUCT} = shorewall6 ]; then
# Symbolically link 'functions' to lib.base
#
ln -sf lib.base ${DESTDIR}${SHAREDIR}/${PRODUCT}/functions
#
# And create a symbolic link for the CLI
#
ln -sf shorewall ${DESTDIR}${SBINDIR}/shorewall6
fi
if [ -d Perl ]; then

4
Shorewall/uninstall.sh
View File

@ -149,6 +149,10 @@ if [ $configure -eq 1 ]; then
fi
fi
if [ $PRODUCT = shorewall6 ]; then
remove_file ${SBINDIR}/shorewall6
fi
if [ -h ${SHAREDIR}/$PRODUCT/init ]; then
FIREWALL=$(readlink -m -q ${SHAREDIR}/$PRODUCT/init)
elif [ -n "$INITFILE" ]; then