diff --git a/src/modules/system/install/ee_mod_install_mysql.sh b/src/modules/system/install/ee_mod_install_mysql.sh index f6c81f08..cc132a4b 100644 --- a/src/modules/system/install/ee_mod_install_mysql.sh +++ b/src/modules/system/install/ee_mod_install_mysql.sh @@ -20,7 +20,7 @@ ee_mod_install_mysql() fi ee_lib_echo "Installing MySQL, please Wait..." - $EE_APT_GET install mysql-server mysqltuner percona-toolkit \ + $EE_APT_GET install mysql-server mysqltuner percona-toolkit | tee -ai EE_ERROR_LOG \ || ee_lib_error "Unable to install MySQL, exit status = " $? # Download tuning-primer.sh diff --git a/src/modules/system/install/ee_mod_install_nginx.sh b/src/modules/system/install/ee_mod_install_nginx.sh index b7c7c5c8..817d8c87 100644 --- a/src/modules/system/install/ee_mod_install_nginx.sh +++ b/src/modules/system/install/ee_mod_install_nginx.sh @@ -3,6 +3,6 @@ function ee_mod_install_nginx() { ee_lib_echo "Installing $EE_NGINX_PACKAGE, please wait..." - $EE_APT_GET install $EE_NGINX_PACKAGE \ + $EE_APT_GET install $EE_NGINX_PACKAGE | tee -ai EE_COMMAND_LOG \ || ee_lib_error "Unable to install $EE_NGINX_PACKAGE, exit status = " $? } diff --git a/src/modules/system/install/ee_mod_install_php.sh b/src/modules/system/install/ee_mod_install_php.sh index 57b36c96..8ac1ad6f 100644 --- a/src/modules/system/install/ee_mod_install_php.sh +++ b/src/modules/system/install/ee_mod_install_php.sh @@ -5,5 +5,5 @@ function ee_mod_install_php() ee_lib_echo "Installing PHP, please wait..." $EE_APT_GET install php5-common php5-mysqlnd php5-xmlrpc \ php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt php5-xdebug \ - php5-memcache memcached || ee_lib_error "Unable to install PHP5, exit status = " $? + php5-memcache memcached | tee -ai EE_COMMAND_LOG || ee_lib_error "Unable to install PHP5, exit status = " $? } diff --git a/src/modules/system/install/ee_mod_install_postfix.sh b/src/modules/system/install/ee_mod_install_postfix.sh index 4a1571c1..0bf00e4e 100644 --- a/src/modules/system/install/ee_mod_install_postfix.sh +++ b/src/modules/system/install/ee_mod_install_postfix.sh @@ -8,5 +8,5 @@ function ee_mod_install_postfix() # Install Postfix ee_lib_echo "Installing Postfix, please wait..." - $EE_APT_GET install postfix || ee_lib_error "Unable to install Postfix, exit status = " $? + $EE_APT_GET install postfix | tee -ai EE_COMMAND_LOG || ee_lib_error "Unable to install Postfix, exit status = " $? } diff --git a/src/vendor/ee_ven_remove_utils.sh b/src/vendor/ee_ven_remove_utils.sh index db3e716b..54686344 100644 --- a/src/vendor/ee_ven_remove_utils.sh +++ b/src/vendor/ee_ven_remove_utils.sh @@ -8,6 +8,9 @@ function ee_ven_remove_utils() || ee_lib_error "Unable to remove EasyEngine (ee) admin utilities" # Drop Anemometer database - mysql -e "drop database slow_query_log" \ - || ee_lib_error "Unable to drop slow_query_log database, exit status = " $? + mysql -e "show databases like 'slow_query_log'" &>> $EE_COMMAND_LOG + if [ $? -eq 0 ]; then + mysql -e "drop database slow_query_log" \ + || ee_lib_error "Unable to drop slow_query_log database, exit status = " $? + fi }