- trigger cleanup and cosmetics

diff --git a/postfix.spec b/postfix.spec
index 4dbbc84bfe652a7354b73c1e2139aaad9c461458..ee79f17ba2d58127af706eeff963c25d4df13e4c 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -379,10 +379,9 @@ fi
 if [ $1 -le 1 ]; then
         exit 0
 fi
-set -x
 for f in /etc/mail/{access,aliases,body_checks,bounce.cf.*,canonical,dynamicmaps.cf,generic,header_checks,main.cf,master.cf,postfix-files,relocated,transport,virtual}; do
-  f=${f##*/}
-  [ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" "/etc/postfix/$f" 2>/dev/null || :
+       f=${f##*/}
+       [ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" "/etc/postfix/$f" 2>/dev/null || :
 done
 find /etc/postfix -type f 2>/dev/null | xargs sed -i -e 's|/etc/mail|/etc/postfix|g' 2>/dev/null
 for f in /etc/mail/*.db; do
@@ -398,7 +397,6 @@ for f in /etc/mail/*.db; do
        fi
 done
 [ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || :
-set +x
 
 %triggerpostun -- %{name} < 2:3.3.2-2
 echo