Small corrections

CHANGELOG.txt

@@ -2,6 +2,7 @@ v3.9.0 - November 11, 2018
 
 [+] Rebranded the fork to WordOps
 [+] Codebase cleanup
+[+] Set PHP 7.2 as the default
 [+] Included support for newer OS releases
 [+] Reworked the HTTPS configuration
 [-] Dropped mail services

README.md

@@ -29,7 +29,7 @@ WordOps made some fundamental changes:
 
 * We've deprecated the mail stack. Less is more. As an alternative, take a look at [iRedMail](https://www.iredmail.org/) or [Caesonia](https://github.com/vedetta-com/caesonia). And an alternative for Roundcube is [Rainloop](https://www.rainloop.net/).
 * Support for w3tc is dropped as a security precaution.
-* We are currently migrating the PHP 5.x series to PHP 7.1 and PHP 7.2. We'll offer an easy to use migration script once we are confident enough to unleash this daemon.
+* We are currently migrating the PHP 5.x series to PHP 7.1 and PHP 7.2. We'll offer an easy to use migration script once we are confident enough to unleash this daemon. For now, new sites get installed with PHP 7.2 as the default.
 
 ## Update WordOps
 

install

@@ -1,28 +1,24 @@
 #!/bin/bash
 
-# WordOps update script.
+# WordOps install and update script
-# This script is designed to install latest WordOps or
-# to update current WordOps from the v3 branch of EasyEngine.
 
-# Define echo function
+# Blue
-
-# Blue color
 function wo_lib_echo()
 {
     echo $(tput setaf 4)$@$(tput sgr0)
 }
-# White color
+# White
 function wo_lib_echo_info()
 {
     echo $(tput setaf 7)$@$(tput sgr0)
 }
-# Red color
+# Red
 function wo_lib_echo_fail()
 {
     echo $(tput setaf 1)$@$(tput sgr0)
 }
 
-# Checking permissions
+# Check whether the installation is called with elevated rights
 if [[ $EUID -ne 0 ]]; then
     wo_lib_echo_fail "Sudo privilege required..."
     wo_lib_echo_fail "Uses: wget -qO wo wordops.se/tup && sudo bash wo"
@@ -36,11 +32,11 @@ function wo_lib_error()
     exit $2
 }
 
-# Execute: apt-get update
+# Update the apt sewers with fresh info
 wo_lib_echo "Executing apt-get update, please wait..."
 apt-get update &>> /dev/null
 
-# Checking lsb_release package
+# Check whether lsb_release is installed, and if not, install it
 if [ ! -x /usr/bin/lsb_release ]; then
     wo_lib_echo "Installing lsb-release, please wait..."
     apt-get -y install lsb-release &>> /dev/null
@@ -49,7 +45,7 @@ fi
 # Define variables for later use
 wo_branch=$1
 readonly wo_version_old="2.2.3"
-readonly wo_version_new="3.8.1"
+readonly wo_version_new="3.9.0"
 readonly wo_log_dir=/var/log/wo/
 readonly wo_install_log=/var/log/wo/install.log
 readonly wo_linux_distro=$(lsb_release -i | awk '{print $3}')
@@ -440,13 +436,7 @@ if [ -f /etc/ImageMagick/policy.xml  ]
 
         elif [ "$wo_distro_version" == "wheezy" ]; then
             grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
-            #grep -Hr "deb http://packages.dotdeb.org wheezy all" /etc/apt/sources.list.d/wo-repo.list &>> /dev/null
             if [[ $? -ne 0 ]]; then
-                # if [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then
-                #     rm -rf /etc/apt/sources.list.d/dotdeb-wheezy.list
-                # else
-                #     sed -i "/deb http:\/\/packages.dotdeb.org wheezy all/d" /etc/apt/sources.list.d/wo-repo.list &>> /dev/null
-                # fi
                 echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /" >> /etc/apt/sources.list.d/wo-repo.list
                 gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
                 gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -

setup.py

@@ -58,7 +58,7 @@ if not os.path.isfile('/root/.gitconfig'):
       shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
 
 setup(name='wo',
-      version='3.8.1',
+      version='3.9.0',
       description=long_description,
       long_description=long_description,
       classifiers=[],