X-Git-Url: https://git.tld-linux.org/?p=packages%2Fspamassassin.git;a=blobdiff_plain;f=sa-update.sh;fp=sa-update.sh;h=0aa6bd8a2cb93595deb762f2711976c89828f3b5;hp=b221c0461a79dfe53d4c5ec91d216276256c0db4;hb=c1afbf53c3b26be67d5774306eda0be93ce514c1;hpb=6fb54ed6717b2c049a93e91e8d635ba5abc7e706

diff --git a/sa-update.sh b/sa-update.sh
index b221c04..0aa6bd8 100644
--- a/sa-update.sh
+++ b/sa-update.sh
@@ -4,15 +4,15 @@ umask 022
 OPT=""
 
 # sa-update must create keyring
-if [ ! -d /etc/mail/spamassassin/sa-update-keys ]; then
+if [ ! -d /etc/spamassassin/sa-update-keys ]; then
 	sa-update
 fi
 
 # Initialize Channels and Keys
 CHANNELLIST=""
 KEYLIST=""
-# Process each channel defined in /etc/mail/spamassassin/channel.d/
-for file in /etc/mail/spamassassin/channel.d/*.conf; do
+# Process each channel defined in /etc/spamassassin/channel.d/
+for file in /etc/spamassassin/channel.d/*.conf; do
     [ ! -f "$file" ] && continue
     # Validate config file
     PREFIXES="CHANNELURL KEYID BEGIN"
@@ -31,7 +31,7 @@ for file in /etc/mail/spamassassin/channel.d/*.conf; do
 done
 
 # Using --channelfile breaks channel.d support :-/ Need better way but stays for now for backward compat
-grep -q "^[a-zA-Z0-9]" /etc/mail/spamassassin/channels && OPT="$OPT --channelfile /etc/mail/spamassassin/channels"
+grep -q "^[a-zA-Z0-9]" /etc/spamassassin/channels && OPT="$OPT --channelfile /etc/spamassassin/channels"
 
 # Run sa-update on each channel, restart spam daemon if success
 for channel in $CHANNELLIST; do