extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-01 15:35:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename some variables:

Browse Source 
HOST -> TARGET
%initdir -> %shorewall_initdir

Also add %shorewall_target

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-02-21 12:34:41 -08:00
parent d5af9c360d
commit 3acd01a44d
3 changed files with 45 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Shorewall-init/install.sh
View File

@ -117,6 +117,8 @@ case "$LIBEXEC" in
;; ;;
esac esac
INITFILE="shorewall-init"
if [ -z "$BUILD" ]; then if [ -z "$BUILD" ]; then
case $(uname) in case $(uname) in
CYGWIN*) CYGWIN*)
@ -149,12 +151,6 @@ case $BUILD in
GROUP=$(id -gn) GROUP=$(id -gn)
;; ;;
MAC) MAC)
if [ -z "$DESTDIR" ]; then
DEST=
INIT=
SPARSE=Yes
fi
[ -z "$OWNER" ] && OWNER=root [ -z "$OWNER" ] && OWNER=root
[ -z "$GROUP" ] && GROUP=wheel [ -z "$GROUP" ] && GROUP=wheel
INSTALLD= INSTALLD=
@ -177,7 +173,7 @@ case "$HOST" in
;; ;;
REDHAT) REDHAT)
echo "Installing Redhat/Fedora-specific configuration..." echo "Installing Redhat/Fedora-specific configuration..."
DEST=/etc/rc.d/init.d INITDIR=/etc/rc.d/init.d
;; ;;
SLACKWARE) SLACKWARE)
echo "Shorewall-init is currently not supported on Slackware" >&2 echo "Shorewall-init is currently not supported on Slackware" >&2
@ -199,12 +195,8 @@ case "$HOST" in
;; ;;
esac esac
if [ -z "$DEST" ] ; then if [ -z "$INITDIR" -a -n "$INITFILE" ] ; then
DEST="/etc/init.d" INITDIR="/etc/init.d"
fi
if [ -z "$INIT" ] ; then
INIT="shorewall-init"
fi fi
if [ -n "$DESTDIR" ]; then if [ -n "$DESTDIR" ]; then
@ -213,7 +205,7 @@ if [ -n "$DESTDIR" ]; then
OWNERSHIP="" OWNERSHIP=""
fi fi
install -d $OWNERSHIP -m 755 ${DESTDIR}${DEST} install -d $OWNERSHIP -m 755 ${DESTDIR}${INITDIR}
fi fi
if [ -z "$DESTDIR" ]; then if [ -z "$DESTDIR" ]; then
@ -243,19 +235,10 @@ fi
# #
# Install the Init Script # Install the Init Script
# #
case $HOST in if [ -n "$INITFILE" ]; then
DEBIAN) install_file init.sh ${DESTDIR}${INITDIR}/$INITFILE 0544
install_file init.debian.sh ${DESTDIR}/etc/init.d/shorewall-init 0544 echo "Shorewall Init script installed in ${DESTDIR}${INITDIR}/$INITFILE"
;; fi
REDHAT)
install_file init.fedora.sh ${DESTDIR}/etc/init.d/shorewall-init 0544
;;
*)
install_file init.sh ${DESTDIR}${DEST}/$INIT 0544
;;
esac
echo "Shorewall Init script installed in ${DESTDIR}${DEST}/$INIT"
# #
# Install the .service file # Install the .service file
@ -282,7 +265,7 @@ chmod 644 ${DESTDIR}/usr/share/shorewall-init/version
# #
if [ -z "$DESTDIR" ]; then if [ -z "$DESTDIR" ]; then
rm -f /usr/share/shorewall-init/init rm -f /usr/share/shorewall-init/init
ln -s ${DEST}/${INIT} /usr/share/shorewall-init/init ln -s ${INITDIR}/${INITFILE} /usr/share/shorewall-init/init
fi fi
if [ $HOST = DEBIAN ]; then if [ $HOST = DEBIAN ]; then
@ -381,7 +364,7 @@ if [ -z "$DESTDIR" ]; then
else else
cant_autostart cant_autostart
fi fi
elif [ "$INIT" != rc.firewall ]; then #Slackware starts this automatically else
cant_autostart cant_autostart
fi fi

60
Shorewall-lite/install.sh
View File

@ -137,6 +137,7 @@ esac
# #
CYGWIN= CYGWIN=
INSTALLD='-D' INSTALLD='-D'
INITFILE=$PRODUCT
T='-T' T='-T'
if [ -z "$BUILD" ]; then if [ -z "$BUILD" ]; then
@ -167,21 +168,10 @@ fi
case $BUILD in case $BUILD in
CYGWIN*) CYGWIN*)
if [ -z "$DESTDIR" ]; then
DEST=
INIT=
fi
OWNER=$(id -un) OWNER=$(id -un)
GROUP=$(id -gn) GROUP=$(id -gn)
;; ;;
MAC) MAC)
if [ -z "$DESTDIR" ]; then
DEST=
INIT=
SPARSE=Yes
fi
[ -z "$OWNER" ] && OWNER=root [ -z "$OWNER" ] && OWNER=root
[ -z "$GROUP" ] && GROUP=wheel [ -z "$GROUP" ] && GROUP=wheel
INSTALLD= INSTALLD=
@ -199,10 +189,12 @@ OWNERSHIP="-o $OWNER -g $GROUP"
case "$HOST" in case "$HOST" in
CYGWIN) CYGWIN)
echo "Installing Cygwin-specific configuration..." echo "$PRODUCT is not supported on Cygwin" >&2
exit 1
;; ;;
MAC) MAC)
echo "Installing Mac-specific configuration..."; echo "$PRODUCT is not supported on OS X" >&2
exit 1
;; ;;
DEBIAN) DEBIAN)
echo "Installing Debian-specific configuration..." echo "Installing Debian-specific configuration..."
@ -210,18 +202,18 @@ case "$HOST" in
;; ;;
REDHAT) REDHAT)
echo "Installing Redhat/Fedora-specific configuration..." echo "Installing Redhat/Fedora-specific configuration..."
DEST=/etc/rc.d/init.d INITDIR=/etc/rc.d/init.d
;; ;;
SLACKWARE) SLACKWARE)
echo "Installing Slackware-specific configuration..." echo "Installing Slackware-specific configuration..."
DEST="/etc/rc.d" INITDIR="/etc/rc.d"
INITFILE="rc.firewall"
MANDIR="/usr/man" MANDIR="/usr/man"
INIT="rc.firewall"
;; ;;
ARCHLINUX) ARCHLINUX)
echo "Installing ArchLinux-specific configuration..." echo "Installing ArchLinux-specific configuration..."
DEST="/etc/rc.d" INITDIR="/etc/rc.d"
INIT="$PRODUCT" INITFILE="$PRODUCT"
;; ;;
LINUX|SUSE) LINUX|SUSE)
;; ;;
@ -231,13 +223,7 @@ case "$HOST" in
;; ;;
esac esac
if [ -z "$DEST" ] ; then [ -z "$INITDIR" ] && INITDIR="/etc/init.d"
DEST="/etc/init.d"
fi
if [ -z "$INIT" ] ; then
INIT="$PRODUCT"
fi
if [ -n "$DESTDIR" ]; then if [ -n "$DESTDIR" ]; then
if [ `id -u` != 0 ] ; then if [ `id -u` != 0 ] ; then
@ -246,7 +232,7 @@ if [ -n "$DESTDIR" ]; then
fi fi
install -d $OWNERSHIP -m 755 ${DESTDIR}/sbin install -d $OWNERSHIP -m 755 ${DESTDIR}/sbin
install -d $OWNERSHIP -m 755 ${DESTDIR}${DEST} install -d $OWNERSHIP -m 755 ${DESTDIR}${DESTFILE}
if [ -n "$SYSTEMD" ]; then if [ -n "$SYSTEMD" ]; then
mkdir -p ${DESTDIR}/lib/systemd/system mkdir -p ${DESTDIR}/lib/systemd/system
@ -300,22 +286,8 @@ echo "$Product control program installed in ${DESTDIR}/sbin/$PRODUCT"
# #
# Install the Firewall Script # Install the Firewall Script
# #
case $HOST in install_file init.sh ${DESTDIR}${INITDIR}/$INITFILE 0544
DEBIAN) echo "$Product script installed in ${DESTDIR}${INITDIR}/$INITFILE"
install_file init.debian.sh ${DESTDIR}/etc/init.d/$PRODUCT 0544
;;
REDHAT)
install_file init.fedora.sh ${DESTDIR}/etc/init.d/$PRODUCT 0544
;;
ARCHLINUX)
install_file init.archlinux.sh ${DESTDIR}/${DEST}/$INIT 0544
;;
*)
install_file init.sh ${DESTDIR}/${DEST}/$INIT 0544
;;
esac
echo "$Product script installed in ${DESTDIR}${DEST}/$INIT"
# #
# Create /etc/$PRODUCT, /usr/share/$PRODUCT and /var/lib/$PRODUCT if needed # Create /etc/$PRODUCT, /usr/share/$PRODUCT and /var/lib/$PRODUCT if needed
@ -449,7 +421,7 @@ chmod 644 ${DESTDIR}/usr/share/$PRODUCT/version
if [ -z "$DESTDIR" ]; then if [ -z "$DESTDIR" ]; then
rm -f /usr/share/$PRODUCT/init rm -f /usr/share/$PRODUCT/init
ln -s ${DEST}/${INIT} /usr/share/$PRODUCT/init ln -s ${INITDIR}/${INITFILE} /usr/share/$PRODUCT/init
fi fi
delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.common delete_file ${DESTDIR}/usr/share/$PRODUCT/lib.common
@ -496,7 +468,7 @@ if [ -z "$DESTDIR" ]; then
else else
cant_autostart cant_autostart
fi fi
elif [ "$INIT" != rc.firewall ]; then #Slackware starts this automatically elif [ "$INITFILE" != rc.firewall ]; then #Slackware starts this automatically
cant_autostart cant_autostart
fi fi
fi fi

54
Shorewall/install.sh
View File

@ -112,6 +112,8 @@ ANNOTATED=
MANDIR=${MANDIR:-"/usr/share/man"} MANDIR=${MANDIR:-"/usr/share/man"}
SPARSE= SPARSE=
INSTALLD='-D' INSTALLD='-D'
INITFILE="$PRODUCT"
[ -n "${LIBEXEC:=/usr/share}" ] [ -n "${LIBEXEC:=/usr/share}" ]
[ -n "${PERLLIB:=/usr/share/shorewall}" ] [ -n "${PERLLIB:=/usr/share/shorewall}" ]
@ -161,21 +163,10 @@ fi
case $BUILD in case $BUILD in
CYGWIN*) CYGWIN*)
if [ -z "$DESTDIR" ]; then
DEST=
INIT=
fi
OWNER=$(id -un) OWNER=$(id -un)
GROUP=$(id -gn) GROUP=$(id -gn)
;; ;;
MAC) MAC)
if [ -z "$DESTDIR" ]; then
DEST=
INIT=
SPARSE=Yes
fi
[ -z "$OWNER" ] && OWNER=root [ -z "$OWNER" ] && OWNER=root
[ -z "$GROUP" ] && GROUP=wheel [ -z "$GROUP" ] && GROUP=wheel
INSTALLD= INSTALLD=
@ -256,9 +247,11 @@ fi
case "$HOST" in case "$HOST" in
CYGWIN) CYGWIN)
echo "Installing Cygwin-specific configuration..." echo "Installing Cygwin-specific configuration..."
INITFILE=
;; ;;
MAC) MAC)
echo "Installing Mac-specific configuration..."; echo "Installing Mac-specific configuration...";
INITFILE=
;; ;;
DEBIAN) DEBIAN)
echo "Installing Debian-specific configuration..." echo "Installing Debian-specific configuration..."
@ -266,18 +259,18 @@ case "$HOST" in
;; ;;
REDHAT) REDHAT)
echo "Installing Redhat/Fedora-specific configuration..." echo "Installing Redhat/Fedora-specific configuration..."
DEST="/etc/rc.d/init.d" INITDIR="/etc/rc.d/init.d"
;; ;;
SLACKWARE) SLACKWARE)
echo "Installing Slackware-specific configuration..." echo "Installing Slackware-specific configuration..."
DEST="/etc/rc.d" INITDIR="/etc/rc.d"
MANDIR="/usr/man" MANDIR="/usr/man"
INIT="rc.firewall" INITFILE="rc.firewall"
;; ;;
ARCHLINUX) ARCHLINUX)
echo "Installing ArchLinux-specific configuration..." echo "Installing ArchLinux-specific configuration..."
DEST="/etc/rc.d" INITDIR="/etc/rc.d"
INIT="$PRODUCT" INITFILE="$PRODUCT"
;; ;;
LINUX) LINUX)
;; ;;
@ -287,12 +280,8 @@ case "$HOST" in
;; ;;
esac esac
if [ -z "$DEST" ] ; then if [ -z "$INITDIR" -a -n "$INITFILE" ] ; then
DEST="/etc/init.d" INITDIR="/etc/init.d"
fi
if [ -z "$INIT" ] ; then
INIT="$PRODUCT"
fi fi
if [ -n "$DESTDIR" ]; then if [ -n "$DESTDIR" ]; then
@ -304,7 +293,7 @@ if [ -n "$DESTDIR" ]; then
fi fi
install -d $OWNERSHIP -m 755 ${DESTDIR}/sbin install -d $OWNERSHIP -m 755 ${DESTDIR}/sbin
install -d $OWNERSHIP -m 755 ${DESTDIR}${DEST} install -d $OWNERSHIP -m 755 ${DESTDIR}${INITDIR}
else else
[ -x /usr/share/shorewall/compiler.pl ] || \ [ -x /usr/share/shorewall/compiler.pl ] || \
{ echo " ERROR: Shorewall >= 4.3.5 is not installed" >&2; exit 1; } { echo " ERROR: Shorewall >= 4.3.5 is not installed" >&2; exit 1; }
@ -346,15 +335,6 @@ fi
# Install the Firewall Script # Install the Firewall Script
# #
case $HOST in case $HOST in
DEBIAN)
install_file init.debian.sh ${DESTDIR}/etc/init.d/$PRODUCT 0544
;;
REDHAT)
install_file init.fedora.sh ${DESTDIR}${DEST}/$PRODUCT 0544
;;
ARCHLINUX)
install_file init.archlinux.sh ${DESTDIR}${DEST}/$INIT 0544
;;
SLACKWARE) SLACKWARE)
if [ $PRODUCT = shorewall ]; then if [ $PRODUCT = shorewall ]; then
install_file init.slackware.firewall.sh ${DESTDIR}${DEST}/rc.firewall 0644 install_file init.slackware.firewall.sh ${DESTDIR}${DEST}/rc.firewall 0644
@ -362,13 +342,13 @@ case $HOST in
fi fi
;; ;;
*) *)
if [ -n "$INIT" ]; then if [ -n "$INITFILE" ]; then
install_file init.sh ${DESTDIR}${DEST}/$INIT 0544 install_file init.sh ${DESTDIR}${INITDIR}/$INITFILE 0544
fi fi
;; ;;
esac esac
[ -n "$INIT" ] && echo "$Product script installed in ${DESTDIR}${DEST}/$INIT" [ -n "$INITFILE" ] && echo "$Product script installed in ${DESTDIR}${INITDIR}/$INITFILE"
# #
# Create /etc/$PRODUCT and /var/lib/$PRODUCT if needed # Create /etc/$PRODUCT and /var/lib/$PRODUCT if needed
@ -1084,7 +1064,7 @@ chmod 644 ${DESTDIR}/usr/share/$PRODUCT/version
if [ -z "$DESTDIR" ]; then if [ -z "$DESTDIR" ]; then
rm -f /usr/share/$PRODUCT/init rm -f /usr/share/$PRODUCT/init
ln -s ${DEST}/${INIT} /usr/share/$PRODUCT/init ln -s ${INITDIR}/${INITFILE} /usr/share/$PRODUCT/init
fi fi
# #
@ -1153,7 +1133,7 @@ if [ -z "$DESTDIR" -a -n "$first_install" -a -z "${CYGWIN}${MAC}" ]; then
else else
cant_autostart cant_autostart
fi fi
elif [ "$INIT" != rc.f ]; then #Slackware starts this automatically elif [ "$INITFILE" != rc.f ]; then #Slackware starts this automatically
cant_autostart cant_autostart
fi fi
fi fi