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

Install the routes file unless $SPARSE

Browse Source 
- Don't delete the file unconditionally.
- Delete an unhelpful comment

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-03-14 14:03:05 -07:00
parent 8c53fa175c
commit 2763826059
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Shorewall/install.sh
View File

@ -102,9 +102,6 @@ require()
cd "$(dirname $0)"
#
# Load packager's settings if any
#
if [ -f shorewall ]; then
PRODUCT=shorewall
Product=Shorewall
@ -742,10 +739,6 @@ if [ -f findgw ]; then
fi
fi
#
# Delete the Routes file
#
delete_file ${DESTDIR}${CONFDIR}/$PRODUCT/routes
#
# Delete the tcstart file
#
@ -989,6 +982,17 @@ if [ -z "$SPARSE" -a ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/actions ]; then
echo "Actions file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/actions"
fi
#
# Install the Routes file
#
run_install $OWNERSHIP -m 0644 routes ${DESTDIR}${SHAREDIR}/$PRODUCT/configfiles/
run_install $OWNERSHIP -m 0644 routes.annotated ${DESTDIR}${SHAREDIR}/$PRODUCT/configfiles/
if [ -z "$SPARSE" -a ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/routes ]; then
run_install $OWNERSHIP -m 0644 routes${suffix} ${DESTDIR}${CONFDIR}/$PRODUCT/routes
echo "Routes file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/routes"
fi
cd ..
#