Rename PLAIN->ANNOTATED

This commit is contained in:
Tom Eastep 2011-06-12 09:45:50 -07:00
parent 65d4709372
commit 8780aff7f2
2 changed files with 8 additions and 8 deletions

View File

@ -106,7 +106,7 @@ if [ -z "$INIT" ] ; then
INIT="shorewall" INIT="shorewall"
fi fi
PLAIN=Yes ANNOTATED=
SPARSE= SPARSE=
MANDIR=${MANDIR:-"/usr/share/man"} MANDIR=${MANDIR:-"/usr/share/man"}
[ -n "${LIBEXEC:=/usr/share}" ] [ -n "${LIBEXEC:=/usr/share}" ]
@ -186,11 +186,11 @@ while [ $finished -eq 0 ]; do
option=${option#s} option=${option#s}
;; ;;
a*) a*)
PLAIN= ANNOTATED=Yes
option=${option#a} option=${option#a}
;; ;;
p*) p*)
PLAIN=Yes ANNOTATED=
option=${option#p} option=${option#p}
;; ;;
*) *)
@ -328,7 +328,7 @@ if [ -n "$DESTDIR" ]; then
chmod 755 ${DESTDIR}/etc/logrotate.d chmod 755 ${DESTDIR}/etc/logrotate.d
fi fi
if [ -z "$PLAIN" ]; then if [ -n "$ANNOTATED" ]; then
mkdir annotated/ mkdir annotated/
cp configfiles/* annotated/ cp configfiles/* annotated/
for f in annotated/*.annotated; do for f in annotated/*.annotated; do

View File

@ -106,7 +106,7 @@ if [ -z "$INIT" ] ; then
INIT="shorewall6" INIT="shorewall6"
fi fi
PLAIN=Yes ANNOTATED=
DEBIAN= DEBIAN=
CYGWIN= CYGWIN=
MAC= MAC=
@ -187,11 +187,11 @@ while [ $finished -eq 0 ]; do
option=${option#s} option=${option#s}
;; ;;
a*) a*)
PLAIN= ANNOTATED=Yes
option=${option#a} option=${option#a}
;; ;;
p*) p*)
PLAIN=Yes ANNOTATED=
option=${option#p} 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 install_file actions.std ${DESTDIR}/usr/share/shorewall6/actions.std 0644
echo "Standard actions file installed as ${DESTDIR}/usr/shared/shorewall6/actions.std" echo "Standard actions file installed as ${DESTDIR}/usr/shared/shorewall6/actions.std"
if [ -z "$PLAIN" ]; then if [ -n "$ANNOTATED" ]; then
mkdir annotated mkdir annotated
cp configfiles/* annotated/ cp configfiles/* annotated/
cd annotated cd annotated