diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 1df1f343d..46f45d3e6 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -106,7 +106,7 @@ if [ -z "$INIT" ] ; then INIT="shorewall" fi -PLAIN=Yes +ANNOTATED= SPARSE= MANDIR=${MANDIR:-"/usr/share/man"} [ -n "${LIBEXEC:=/usr/share}" ] @@ -186,11 +186,11 @@ while [ $finished -eq 0 ]; do option=${option#s} ;; a*) - PLAIN= + ANNOTATED=Yes option=${option#a} ;; p*) - PLAIN=Yes + ANNOTATED= option=${option#p} ;; *) @@ -328,7 +328,7 @@ if [ -n "$DESTDIR" ]; then chmod 755 ${DESTDIR}/etc/logrotate.d fi -if [ -z "$PLAIN" ]; then +if [ -n "$ANNOTATED" ]; then mkdir annotated/ cp configfiles/* annotated/ for f in annotated/*.annotated; do diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 65b8a8832..b0b781cf2 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -106,7 +106,7 @@ if [ -z "$INIT" ] ; then INIT="shorewall6" fi -PLAIN=Yes +ANNOTATED= DEBIAN= CYGWIN= MAC= @@ -187,11 +187,11 @@ while [ $finished -eq 0 ]; do option=${option#s} ;; a*) - PLAIN= + ANNOTATED=Yes option=${option#a} ;; p*) - PLAIN=Yes + ANNOTATED= option=${option#p} ;; *) @@ -372,7 +372,7 @@ echo "Default config path file installed as ${DESTDIR}/usr/share/shorewall6/conf install_file actions.std ${DESTDIR}/usr/share/shorewall6/actions.std 0644 echo "Standard actions file installed as ${DESTDIR}/usr/shared/shorewall6/actions.std" -if [ -z "$PLAIN" ]; then +if [ -n "$ANNOTATED" ]; then mkdir annotated cp configfiles/* annotated/ cd annotated