X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=3a15e883ca5d63070014862da8be58cd2f0b2d87;hp=14f070b100d14cf8a00a04ed004dba59cd1124b8;hb=6b9048c0c7d7d2522ba9d8c338f6aabed5ec4c01;hpb=339aaca73c0b593ce4f8aba2d7cb7f4be80df2b7 diff --git a/update_spamassassin b/update_spamassassin index 14f070b..3a15e88 100755 --- a/update_spamassassin +++ b/update_spamassassin @@ -48,14 +48,14 @@ else echo $$ > "$SACONFIG/.update_spamassassin"; fi; -function remove_pidfile(){ +remove_pidfile () { rm "$SACONFIG/.update_spamassassin"; } -trap remove_pidfile ERR; +trap remove_pidfile 0; FAILUREMESSAGE=""; -function report_failure(){ +report_failure () { # Hrm; a previous update failed; don't report again until the file # is removed or it's more than a day old if [ -e "$SACONFIG/failed_update" ] &&