Commits

Zhang Huangbin committed d636bec

Typo.

Comments (0)

Files changed (2)

iRedMail/functions/cluebringer.sh

             checkspf.tsql \
             greylisting.tsql \
             accounting.tsql; do
-            # accounting.tsql is shipped in 2.0.11.
-            [ -f $i ] && bash convert ${policyd_sql_type} $i >> ${tmp_sql}
+            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
         done >> ${tmp_sql}
 
         unset policyd_sql_type

iRedMail/functions/packages_freebsd.sh

             portname="$( echo ${i} | tr -d '-' | tr -d '/' | tr -d '\.' )"
             status="\$status_fetch_port_$portname"
             if [ X"$(eval echo ${status})" != X"DONE" ]; then
-                ECHO_INFO "Fetching all distfiles for port: ${i}"
+                ECHO_INFO "Fetching required distfiles for port: ${i}"
                 cd /usr/ports/${i} && make fetch-recursive
                 if [ X"$?" == X"0" ]; then
                     echo "export status_fetch_port_${portname}='DONE'" >> ${STATUS_FILE}
                     make clean && make install clean
 
                     if [ X"$?" == X"0" ]; then
-                        echo "export status_install_port_${portname}='DONE'" >> ${STATUS_FILE}
-
                         # Log used time
                         used_time="$(($(date +%s)-port_start_time))"
                         echo "# Used time (${i}): ${used_time} seconds, about $((used_time/60)) minutes" >> ${STATUS_FILE}
+
+                        echo "export status_install_port_${portname}='DONE'" >> ${STATUS_FILE}
                     else
                         ECHO_ERROR "Port was not success installed, please fix it manually and then re-execute this script."
                         exit 255