net-analyzer/snort: [QA] Fix UnnecessarySlashStrip

Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild
index 21aba42de764903159936bf95f9a0b4de9f5863b..21bdbd51248011bed19be36fcf87d5114cce812d 100644 (file)
--- a/net-analyzer/snort/snort-2.9.15.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.1.ebuild
@@ -150,42 +150,42 @@ src_install() {
 
        # Sourcefire uses Makefiles to install docs causing Bug #297190.
        # This removes the unwanted doc directory and rogue Makefiles.
-       rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-       rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+       rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+       rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
        # Remove unneeded .la files (Bug #382863)
-       rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-       rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+       rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+       rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
        # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
        sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Set the correct rule location in the config
        sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Set the correct preprocessor/decoder rule location in the config
        sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Enable the preprocessor/decoder rules
        sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Just some clean up of trailing /'s in the config
        sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Make it clear in the config where these are...
        sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Disable all rule files by default.
        sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
@@ -205,17 +205,17 @@ src_install() {
 
        # Set snort to run as snort:snort
        sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
        sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Set the default log dir
        sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Set the correct so_rule location in the config
        sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 }
 
 pkg_postinst() {

diff --git a/net-analyzer/snort/snort-2.9.15.ebuild b/net-analyzer/snort/snort-2.9.15.ebuild
index e9688b46d280610a20baf83b55f6c596a16af961..38037a16bb2c289759db596c2921f3413ce6779b 100644 (file)
--- a/net-analyzer/snort/snort-2.9.15.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.ebuild
@@ -163,42 +163,42 @@ src_install() {
 
        # Sourcefire uses Makefiles to install docs causing Bug #297190.
        # This removes the unwanted doc directory and rogue Makefiles.
-       rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-       rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+       rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+       rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
        # Remove unneeded .la files (Bug #382863)
-       rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-       rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+       rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+       rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
        # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
        sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Set the correct rule location in the config
        sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Set the correct preprocessor/decoder rule location in the config
        sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Enable the preprocessor/decoder rules
        sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Just some clean up of trailing /'s in the config
        sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Make it clear in the config where these are...
        sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Disable all rule files by default.
        sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
@@ -218,17 +218,17 @@ src_install() {
 
        # Set snort to run as snort:snort
        sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
        sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Set the default log dir
        sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 
        # Set the correct so_rule location in the config
        sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-               "${ED%/}/etc/snort/snort.conf.distrib" || die
+               "${ED}/etc/snort/snort.conf.distrib" || die
 }
 
 pkg_postinst() {