diff --git a/install b/install index 7e94432..ed8fe35 100755 --- a/install +++ b/install @@ -7,10 +7,10 @@ # Copyright (c) 2019 - WordOps # This script is licensed under M.I.T # ------------------------------------------------------------------------- -# Version 3.9.5 - 2019-05-02 +# Version 3.9.5 - 2019-05-10 # ------------------------------------------------------------------------- readonly wo_version_old="2.2.3" -readonly wo_version_new="3.9.5" +readonly wo_version_new="3.9.5.1" # CONTENTS # --- # 1. VARIABLES AND DECLARATIONS @@ -169,17 +169,25 @@ fi wo_install_dep() { { + + [ -z "$wo_travis" ] && { + # update server packages + DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y dist-upgrade + } > /dev/null 2>&1 if [ "$wo_linux_distro" == "Ubuntu" ]; then + # add nginx repository gpg key wget https://download.opensuse.org/repositories/home:virtubox:WordOps/xUbuntu_"$wo_distro_id"/Release.key -O Release.key apt-key add - < Release.key rm -f Release.key + # install dependencies DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install build-essential curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common pigz gnupg2 cron ccze rsync tree haveged ufw > /dev/null 2>&1 else + # add nginx repository gpg ke wget https://download.opensuse.org/repositories/home:virtubox:WordOps/Debian_9.0/Release.key -O Release.key apt-key add - < Release.key rm -f Release.key [ -d /etc/apt/trusted.gpg.d ] && { wget -qO /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg; } - + # install dependencies DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install build-essential curl gzip dirmngr sudo python3 python3-apt python3-setuptools python3-dev ca-certificates sqlite3 git tar software-properties-common pigz apt-transport-https gnupg2 cron ccze rsync tree haveged ufw > /dev/null 2>&1 fi @@ -688,7 +696,7 @@ if [ -x /usr/local/bin/wo ]; then else wo_install | tee -ai $wo_install_log fi - if [ -x "$(command -v nginx)" ]; then + if [ -n "$(command -v nginx)" ]; then wo_lib_echo "Upgrading Nginx" | tee -ai $wo_install_log wo_upgrade_nginx | tee -ai $wo_install_log fi @@ -726,7 +734,7 @@ else else wo_install | tee -ai $wo_install_log fi - if [ -x "$(command -v nginx)" ]; then + if [ -n "$(command -v nginx)" ]; then wo_lib_echo "Upgrading Nginx" | tee -ai $wo_install_log wo_upgrade_nginx | tee -ai $wo_install_log fi