Copy only libraries that are required by Shorewall to operate properly.
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-core/install.sh | 26 +++++++++++++++++++-------
Shorewall-lite/install.sh | 10 ++++++++--
Shorewall/install.sh | 10 ++++++++--
3 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh
index e6b056c..d17da49 100755
--- a/Shorewall-core/install.sh
+++ b/Shorewall-core/install.sh
@@ -344,8 +344,14 @@ echo "wait4ifup installed in
${DESTDIR}${LIBEXECDIR}/shorewall/wait4ifup"
# Install the libraries
#
for f in lib.* ; do
- install_file $f ${DESTDIR}${SHAREDIR}/shorewall/$f 0644
- echo "Library ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/shorewall/$f"
+ case $f in
+ *installer)
+ ;;
+ *)
+ install_file $f ${DESTDIR}${SHAREDIR}/shorewall/$f 0644
+ echo "Library ${f#*.} file installed as
${DESTDIR}${SHAREDIR}/shorewall/$f"
+ ;;
+ esac
done
if [ $SHAREDIR != /usr/share ]; then
@@ -406,11 +412,17 @@ fi
if [ ${SHAREDIR} != /usr/share ]; then
for f in lib.*; do
- if [ $BUILD != apple ]; then
- eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\'
${DESTDIR}${SHAREDIR}/shorewall/$f
- else
- eval sed -i \'\' -e \'s\|/usr/share/\|${SHAREDIR}/\|\'
${DESTDIR}${SHAREDIR}/shorewall/$f
- fi
+ case $f in
+ *installer)
+ ;;
+ *)
+ if [ $BUILD != apple ]; then
+ eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\'
${DESTDIR}${SHAREDIR}/shorewall/$f
+ else
+ eval sed -i \'\' -e \'s\|/usr/share/\|${SHAREDIR}/\|\'
${DESTDIR}${SHAREDIR}/shorewall/$f
+ fi
+ ;;
+ esac
done
fi
#
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 92fe219..b57785e 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -395,8 +395,14 @@ echo "Default config path file installed as
${DESTDIR}${SHAREDIR}/$PRODUCT/confi
#
for f in lib.* ; do
if [ -f $f ]; then
- install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644
- echo "Library ${f#*.} file installed as
${DESTDIR}${SHAREDIR}/$PRODUCT/$f"
+ case $f in
+ *installer)
+ ;;
+ *)
+ install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644
+ echo "Library ${f#*.} file installed as
${DESTDIR}${SHAREDIR}/$PRODUCT/$f"
+ ;;
+ esac
fi
done
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 7bce503..aa09445 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -1057,8 +1057,14 @@ cd ..
#
for f in lib.* Perl/lib.*; do
if [ -f $f ]; then
- install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$(basename $f) 0644
- echo "Library ${f#*.} file installed as
${DESTDIR}${SHAREDIR}/$PRODUCT/$f"
+ case $f in
+ *installer)
+ ;;
+ *)
+ install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$(basename $f)
0644
+ echo "Library ${f#*.} file installed as
${DESTDIR}${SHAREDIR}/$PRODUCT/$f"
+ ;;
+ esac
fi
done
--
2.8.3
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
