TMPDIR=$(mktemp -d);
-if [ "$HOSTNAME" = "rietz" ] || [ "$HOSTNAME" = "busoni" ]; then
+HOSTNAME=$(hostname);
+
+if [ "$HOSTNAME" = "buxtehude" ]; then
BASEDIR="/org/bugs.debian.org"
USERCONF="bugs/user_prefs";
-elif [ "$HOSTNAME" = "liszt" ]; then
+elif [ "$HOSTNAME" = "bendel" ]; then
BASEDIR="/var/list/.etc";
USERCONF="lists/user_prefs";
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" ] &&
fi;
mv "$SACONFIG" "$BAKDIR/spamassassin_config_r$ORIGREV"
mv "$TMPDIR/spamassassin_config" "$SACONFIG"
-trap - ERR
+trap - 0
remove_pidfile
rm -rf "$TMPDIR"
-if [ "$HOSTNAME" == "rietz" ]; then
+if [ "$HOSTNAME" = "buxtehude" ]; then
touch /home/debbugs/.spamassassin/user_prefs
-elif [ "$HOSTNAME" == "liszt" ]; then
+elif [ "$HOSTNAME" = "bendel" ]; then
# do nothing
true;
else