X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=epanic-clean;h=f6328c2b41a26bd27624098d013f872b307c68d6;hb=ee27d59f1eea7a83b1764ec41bfb3015bb463a26;hp=c171746cc41f848eeed9c9d09d525e7feda34d18;hpb=50f25d1eec109c4596cfc638c9a7c98da0f0b5d0;p=distro-setup

diff --git a/epanic-clean b/epanic-clean
index c171746..f6328c2 100755
--- a/epanic-clean
+++ b/epanic-clean
@@ -50,6 +50,11 @@ v() {
   fi
 }
 
+spamd_ser=spamd
+if systemctl cat spamassassin &>/dev/null; then
+  spamd_ser=spamassassin
+fi
+
 
 pl=/var/log/exim4/paniclog
 main() {
@@ -108,7 +113,7 @@ main() {
       jmax="$(date -d @$sec_max "+%F %H:%M:%S")"
       description=$(systemctl cat $service | sed -rn 's/^ *Description=(.*)/\1/p')
       jrregex="^Starting $description"
-      if [[ $service == spamassassin ]]; then
+      if [[ $service == "$spamd_ser" ]]; then
         jrregex+="\|^spamd: restarting"
       fi
       d "jrregex=$jrregex jmin=$jmin jmax=$jmax"
@@ -129,9 +134,9 @@ main() {
         sed -ri "/$regex/d" $pl
       fi
     fi
-  done <<'EOF'
+  done <<EOF
 clamav-daemon malware acl condition
-spamassassin spam acl condition
+$spamd_ser spam acl condition
 EOF
   ### end removing panic lines due to service restarts ###
 
@@ -197,7 +202,7 @@ if [[ ! -w $pl-archive ]]; then
   chmod 664 $pl-archive
 fi
 
-if [[ $INVOCATION_ID ]]; then
+if [[ $PPID == 1 ]]; then
   loop-main
 else
   main