From 43f633e2af01fd73d572f319deeac11c601f0eed Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Mon, 2 Sep 2019 19:50:01 +0200 Subject: [PATCH] Speed up install --- install | 113 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 53 deletions(-) diff --git a/install b/install index 65a8ee0..6d72259 100755 --- a/install +++ b/install @@ -107,16 +107,16 @@ unset LANG export LANG='en_US.UTF-8' export LC_ALL='C.UTF-8' -[ -z "$wo_travis" ] && { - apt-get update -qq -} - command_exists() { command -v "$@" > /dev/null 2>&1 } -if ! command_exists curl; then - apt-get -y install curl -qq +if command_exists curl; then + if [ -z "$wo_travis" ]; then + apt-get update -qq & + else + apt-get update && apt-get -y install curl -qq + fi fi if [ -f ./setup.py ]; then @@ -823,43 +823,45 @@ else fi fi wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log - wo_install_dep - wo_timesync + wo_install_dep & + wo_timesync & wo_lib_echo "Backing-up WO install" | tee -ai $wo_install_log - wo_backup_wo - secure_wo_db + wo_backup_wo & + secure_wo_db & wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log - wo_clean + wo_clean & + wait if [ "$wo_travis" = "y" ]; then - wo_install_travis + wo_install_travis & else if [ -f "$HOME/.gitconfig" ]; then - wo_install >> $wo_install_log 2>&1 + wo_install >> $wo_install_log 2>&1 & else wo_install fi fi - wo_update_latest + wo_update_latest & if [ ! -d /opt/acme/.sh ]; then wo_lib_echo "Updating acme.sh" | tee -ai $wo_install_log - wo_install_acme_sh + wo_install_acme_sh & fi wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log - wo_tweak_kernel + wo_tweak_kernel & if [ ! -f /opt/wo-kernel.sh ]; then wo_lib_echo "Adding systemd service tweak" | tee -ai $wo_install_log - wo_systemd_tweak + wo_systemd_tweak & fi if [ -x /usr/sbin/nginx ]; then - wo_nginx_tweak + wo_nginx_tweak & fi if [ -d /etc/systemd/system/mariadb.service.d ]; then - wo_mariadb_tweak + wo_mariadb_tweak & fi - wo_cheat_install - wo_domain_suffix + wo_cheat_install & + wo_domain_suffix & wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log - wo_update_wp_cli + wo_update_wp_cli & + wait else # 2 - Migration from EEv3 if [ -x /usr/local/bin/ee ]; then @@ -870,47 +872,50 @@ else fi fi wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log - wo_install_dep >> $wo_install_log 2>&1 - wo_timesync >> $wo_install_log 2>&1 + wo_install_dep >> $wo_install_log 2>&1 & + wo_timesync >> $wo_install_log 2>&1 & wo_lib_echo "Backing-up EE install" | tee -ai $wo_install_log - wo_backup_ee >> $wo_install_log 2>&1 + wo_backup_ee >> $wo_install_log 2>&1 & wo_lib_echo "Removing EasyEngine cronjob" | tee -ai $wo_install_log - wo_remove_ee_cron >> $wo_install_log 2>&1 + wo_remove_ee_cron >> $wo_install_log 2>&1 & wo_lib_echo "Syncing WO database" | tee -ai $wo_install_log - wo_sync_db >> $wo_install_log 2>&1 - secure_wo_db >> $wo_install_log 2>&1 + wo_sync_db >> $wo_install_log 2>&1 & + secure_wo_db >> $wo_install_log 2>&1 & + wait wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log if [ -f "$HOME/.gitconfig" ]; then - wo_install >> $wo_install_log 2>&1 + wo_install >> $wo_install_log 2>&1 & else wo_install | tee -ai $wo_install_log fi if command_exists nginx; then wo_lib_echo "Upgrading Nginx" | tee -ai $wo_install_log - wo_upgrade_nginx >> $wo_install_log 2>&1 + wo_upgrade_nginx >> $wo_install_log 2>&1 & fi - wo_update_latest >> $wo_install_log 2>&1 + wait + wo_update_latest >> $wo_install_log 2>&1 & wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log - wo_install_acme_sh >> $wo_install_log 2>&1 + wo_install_acme_sh >> $wo_install_log 2>&1 & wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log - wo_tweak_kernel >> $wo_install_log 2>&1 + wo_tweak_kernel >> $wo_install_log 2>&1 & if [ ! -f /opt/wo-kernel.sh ]; then wo_lib_echo "Adding systemd service tweak" | tee -ai $wo_install_log - wo_systemd_tweak + wo_systemd_tweak & fi if command_exists nginx; then - wo_nginx_tweak + wo_nginx_tweak & fi if [ -d /etc/systemd/system/mariadb.service.d ]; then - wo_mariadb_tweak + wo_mariadb_tweak & fi - wo_domain_suffix >> $wo_install_log + wo_domain_suffix >> $wo_install_log & wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log { - wo_git_init - wo_update_wp_cli - wo_cheat_install + wo_git_init & + wo_update_wp_cli & + wo_cheat_install & } >> $wo_install_log + wait wo_lib_echo "Cleaning-up EE previous install" | tee -ai $wo_install_log wo_clean_ee >> $wo_install_log else @@ -919,38 +924,40 @@ else [ -z "$wo_travis" ] && { wo_dist_upgrade >> $wo_install_log } - wo_install_dep >> $wo_install_log - wo_timesync >> $wo_install_log + wo_install_dep >> $wo_install_log & + wo_timesync >> $wo_install_log & + wait wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log if [ "$wo_travis" = "y" ]; then - wo_install_travis | tee -ai $wo_install_log + wo_install_travis | tee -ai $wo_install_log & else if [ -f "$HOME/.gitconfig" ]; then - wo_install >> $wo_install_log 2>&1 + wo_install >> $wo_install_log 2>&1 & else wo_install | tee -ai $wo_install_log fi fi if [ "$ufw" = "y" ]; then wo_lib_echo "Configuring UFW" | tee -ai $wo_install_log - wo_ufw_setup + wo_ufw_setup & fi wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log - wo_tweak_kernel >> $wo_install_log 2>&1 + wo_tweak_kernel >> $wo_install_log 2>&1 & if [ ! -f /opt/wo-kernel.sh ]; then wo_lib_echo "Adding systemd service tweak" | tee -ai $wo_install_log - wo_systemd_tweak >> $wo_install_log 2>&1 + wo_systemd_tweak >> $wo_install_log 2>&1 & fi wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log { - wo_install_acme_sh - secure_wo_db - wo_cheat_install - wo_domain_suffix - wo_git_init - wo_update_wp_cli + wo_install_acme_sh & + secure_wo_db & + wo_cheat_install & + wo_domain_suffix & + wo_git_init & + wo_update_wp_cli & } >> $wo_install_log + wait fi fi