diff --git a/install b/install index fde4dca..58d0161 100755 --- a/install +++ b/install @@ -7,10 +7,12 @@ # Copyright (c) 2019 - WordOps # This script is licensed under M.I.T # ------------------------------------------------------------------------- +# wget -qO wo wops.cc && sudo bash wo +# ------------------------------------------------------------------------- # Version 3.9.8 - 2019-08-17 # ------------------------------------------------------------------------- readonly wo_version_old="2.2.3" -readonly wo_version_new="3.9.8" +export DEBIAN_FRONTEND=noninteractive # CONTENTS # --- # 1. VARIABLES AND DECLARATIONS @@ -87,14 +89,10 @@ done ### if [[ $EUID -ne 0 ]]; then wo_lib_echo_fail "Sudo privilege required..." - wo_lib_echo_fail "Use: curl -sL wops.cc | sudo bash" + wo_lib_echo_fail "Use: wget -qO wo wops.cc && sudo bash wo " exit 100 fi -echo "" -wo_lib_echo "Welcome to WordOps install script v${wo_version_new}" -echo "" - ### # 1- Update the apt sewers with fresh info ### @@ -103,6 +101,17 @@ echo "" apt-get update -qq } +if [ -z "$(command -v curl)" ]; then + apt-get -y install curl -qq +fi +readonly wo_version_new=$(curl -sL https://wops.cc/setup.py 2>&1 | grep "version='" setup.py | awk -F "'" '{print$2}' 2>&1) + +echo "" +wo_lib_echo "Welcome to WordOps install script v${wo_version_new}" +echo "" + + + ### # 1- Check whether lsb_release is installed, and if not, install it ### @@ -176,7 +185,7 @@ fi wo_install_dep() { { - export DEBIAN_FRONTEND=noninteractive + [ -z "$wo_travis" ] && { # update server packages apt-get dist-upgrade --option=Dpkg::options::=--force-confmiss --option=Dpkg::options::=--force-confold --option=Dpkg::options::=--force-unsafe-io --assume-yes --quiet diff --git a/setup.py b/setup.py index 306e30e..12d2961 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ if not os.path.isfile('/root/.gitconfig'): shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig') setup(name='wo', - version='3.9.8', + version='3.9.8.1', description=long_description, long_description=long_description, classifiers=[], diff --git a/wo/core/variables.py b/wo/core/variables.py index 7c6b6c4..93ec7e8 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -10,7 +10,9 @@ class WOVariables(): """Intialization of core variables""" # WordOps version - wo_version = "3.9.8" + wo_version = os.popen( + "/bin/grep \"EASY-INSTALL-ENTRY-SCRIPT\" /usr/local/bin/wo " + "| awk -F \"'\" '{print$2}' | awk -F \"==\" '{print$2}'") # WordOps packages versions wo_wp_cli = "2.2.0" wo_adminer = "4.7.2"