| 1 |
commit: 5d171c2f33400acf8517e5ddbf0ad9e53bf8db25 |
| 2 |
Author: Hank Leininger <hlein <AT> korelogic <DOT> com> |
| 3 |
AuthorDate: Sun Jun 27 18:15:54 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 29 04:12:02 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d171c2f |
| 7 |
|
| 8 |
mail-filter/spamassassin: Fixed command -v usage |
| 9 |
|
| 10 |
command -v writes to stdout, not stderr. As it happens this whole |
| 11 |
script is >/dev/null, so this instance is Mostly Harmless - unless |
| 12 |
someone copies it as an example of what to do. |
| 13 |
|
| 14 |
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com> |
| 15 |
Bug: https://bugs.gentoo.org/798933 |
| 16 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/21448 |
| 18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 19 |
|
| 20 |
mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron | 4 ++-- |
| 21 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 22 |
|
| 23 |
diff --git a/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron b/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron |
| 24 |
index 7c6990b847c..edac381b5de 100644 |
| 25 |
--- a/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron |
| 26 |
+++ b/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron |
| 27 |
@@ -19,7 +19,7 @@ if (( $? == 0 || $? == 3 )); then |
| 28 |
|
| 29 |
# Do you run spamd or amavisd? Both daemons need to be reloaded |
| 30 |
# in order to pick up the newly-updated rules. |
| 31 |
- if command -v rc-service 2>/dev/null; then |
| 32 |
+ if command -v rc-service >/dev/null; then |
| 33 |
# OpenRC is installed. These "status" checks should succeed |
| 34 |
# only when the daemon is running under OpenRC. We redirect |
| 35 |
# stderr to hide the lecture that OpenRC gives you if you |
| 36 |
@@ -28,7 +28,7 @@ if (( $? == 0 || $? == 3 )); then |
| 37 |
rc-service amavisd status 2>/dev/null && rc-service amavisd reload |
| 38 |
fi |
| 39 |
|
| 40 |
- if command -v systemctl 2>/dev/null; then |
| 41 |
+ if command -v systemctl >/dev/null; then |
| 42 |
# The systemctl (systemd) executable is installed, so try to |
| 43 |
# use it to restart spamd and amavisd. These are safe to run |
| 44 |
# if systemd is installed but not in use. The is-active |
Archives