Commits

Zhang Huangbin committed a47ef0c

Code cleanup.

Comments (0)

Files changed (2)

iRedMail/functions/cluebringer.sh

             checkspf.tsql \
             greylisting.tsql \
             accounting.tsql; do
-            if [ -f $i ]; then
-                if [ -f convert-tsql ]; then
-                    bash convert-tsql ${policyd_sql_type} $i >> ${tmp_sql}
-                elif [ -f convert ]; then
-                    bash convert ${policyd_sql_type} $i >> ${tmp_sql}
-                fi
-            fi
+            [ -f $i ] && bash convert-tsql ${policyd_sql_type} $i >> ${tmp_sql}
         done >> ${tmp_sql}
 
         unset policyd_sql_type

iRedMail/functions/packages_freebsd.sh

             status="\$status_install_port_$portname"
             if [ X"$(eval echo ${status})" != X"DONE" ]; then
                 cd /usr/ports/${i} && \
-                    ECHO_INFO "Installing port: ${i} $(date '+%Y-%m-%d %H:%M:%S')..."
+                    ECHO_INFO "Installing port: ${i} ($(date '+%Y-%m-%d %H:%M:%S')) ..."
                     echo "export status_install_port_${portname}='processing'" >> ${STATUS_FILE}
 
                     # Get time as a UNIX timestamp (seconds elapsed since Jan 1, 1970 0:00 UTC)