Init tools only if installed, warn otherwise. Add Pyzor init.

1 files changed, 20 insertions, 6 deletions

diff --git a/amavis/amavis.sh b/amavis/amavis.sh
index 7675879..0ef7964 100755
--- a/amavis/amavis.sh
+++ b/amavis/amavis.sh
@@ -1,10 +1,24 @@
-#!/bin/sh -x
+#!/bin/sh
 
 set -e
 
-su - amavis -c 'razor-admin -d -create'
-su - amavis -c 'razor-admin -d -register' || su - amavis -c 'razor-admin -register' || su - amavis -c 'razor-admin -register' \
-	|| echo "Run this command until it succeeds: \"su - amavis -c 'razor-admin -register'\""
+if [ -x /usr/bin/razor-admin ]; then
+	su - amavis -c 'razor-admin -d -create'
+	su - amavis -c 'razor-admin -d -register' || su - amavis -c 'razor-admin -register' || su - amavis -c 'razor-admin -register' \
+		|| echo "Run this command until it succeeds: \"su - amavis -c 'razor-admin -register'\""
+else
+	echo "WARNING: Razor not installed!"
+fi
 
-rm -rf /var/lib/amavis/.spamassassin
-su amavis -c 'sa-learn --sync'
+if [ -x /usr/bin/pyzor ]; then
+	su - amavis -c 'pyzor discover'
+else
+	echo "WARNING: Pyzor not installed!"
+fi
+
+if [ -x /usr/bin/sa-learn ]; then
+	rm -rf /var/lib/amavis/.spamassassin
+	su amavis -c 'sa-learn --sync'
+else
+	echo "WARNING: SpamAssassin not installed!"
+fi