From 664e3bb0a8b4f1caf4a3506669b7ef2df8300879 Mon Sep 17 00:00:00 2001 From: Thomas D Date: Sat, 15 Nov 2014 16:46:44 +0100 Subject: [PATCH] Installer: $INITDIR already starts with a "/", so no need for, "$DESTDIR/$INITDIR" Hi, before the patch (DESTDIR = "/tmp/shorewall-4.6.5"; INITDIR = "/etc/init.d"), > [...] > SysV init script init.gentoo.sh installed in /tmp/shorewall-4.6.5//etc/init.d/shorewall-lite after the patch > [...] > SysV init script init.gentoo.sh installed in /tmp/shorewall-4.6.5/etc/init.d/shorewall-lite -Thomas From e7a192397323bb6cb66d08a6f24e7edfee044f31 Mon Sep 17 00:00:00 2001 From: Thomas D Date: Sat, 15 Nov 2014 16:38:05 +0100 Subject: [PATCH] $INITDIR already starts with a "/", so no need for "$DESTDIR/$INITDIR" Before the patch (DESTDIR = "/tmp/shorewall-4.6.5"; INITDIR = "/etc/init.d"), > [...] > SysV init script init.gentoo.sh installed in /tmp/shorewall-4.6.5//etc/init.d/shorewall-lite after the patch > [...] > SysV init script init.gentoo.sh installed in /tmp/shorewall-4.6.5/etc/init.d/shorewall-lite Signed-off-by: Tom Eastep --- Shorewall-lite/install.sh | 2 +- Shorewall/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 453a84a43..0c6d8cc0e 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -381,7 +381,7 @@ fi if [ -n "$INITFILE" ]; then if [ -f "${INITSOURCE}" ]; then - initfile="${DESTDIR}/${INITDIR}/${INITFILE}" + initfile="${DESTDIR}${INITDIR}/${INITFILE}" install_file ${INITSOURCE} "$initfile" 0544 [ "${SHAREDIR}" = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' "$initfile" diff --git a/Shorewall/install.sh b/Shorewall/install.sh index c1176d668..f3ca8e904 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -396,7 +396,7 @@ echo "$PRODUCT control program installed in ${DESTDIR}${SBINDIR}/$PRODUCT" # if [ -n "$INITFILE" ]; then if [ -f "${INITSOURCE}" ]; then - initfile="${DESTDIR}/${INITDIR}/${INITFILE}" + initfile="${DESTDIR}${INITDIR}/${INITFILE}" install_file $INITSOURCE "$initfile" 0544 [ "${SHAREDIR}" = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' "$initfile"