From 4ba8007a065ba494962f64b00444833b67a0f671 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Thu, 25 Apr 2019 11:01:26 +0200
Subject: [PATCH] update version to prepare release

---
 install              | 26 +++++++++++++-------------
 setup.py             |  2 +-
 wo/core/variables.py |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/install b/install
index 1ea406b..59f8d3e 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-04-22
+# Version 3.9.5 - 2019-04-25
 # -------------------------------------------------------------------------
 readonly wo_version_old="2.2.3"
-readonly wo_version_new="3.9.4.6"
+readonly wo_version_new="3.9.5"
 # CONTENTS
 # ---
 # 1. VARIABLES AND DECLARATIONS
@@ -380,15 +380,6 @@ wo_install_acme_sh() {
             # enable auto-upgrade
             /etc/letsencrypt/acme.sh --config-home /etc/letsencrypt/config --upgrade --auto-upgrade
 
-            # Let's Encrypt .well-known folder setup
-            if [ ! -d /var/www/html/.well-known/acme-challenge ]; then
-                mkdir -p /var/www/html/.well-known/acme-challenge
-                chown -R www-data:www-data /var/www/html /var/www/html/.well-known
-                chmod 750 /var/www/html /var/www/html/.well-known
-            else
-                chmod 750 /var/www/html /var/www/html/.well-known
-            fi
-
         } >> "$wo_install_log" 2>&1
     fi
     if [ -d "$HOME/.acme.sh" ]; then
@@ -406,6 +397,14 @@ wo_install_acme_sh() {
 
         } >> "$wo_install_log" 2>&1
     fi
+    # Let's Encrypt .well-known folder setup
+    if [ ! -d /var/www/html/.well-known/acme-challenge ]; then
+        mkdir -p /var/www/html/.well-known/acme-challenge
+        chown -R www-data:www-data /var/www/html /var/www/html/.well-known
+        chmod 750 /var/www/html /var/www/html/.well-known
+    else
+        chmod 750 /var/www/html /var/www/html/.well-known
+    fi
 }
 
 # Clone Github repository if it doesn't exist
@@ -642,8 +641,9 @@ wo_clean_ee() {
 
 # 1 - WO already installed
 if [ -x /usr/local/bin/wo ]; then
-    wo -v 2>&1 | grep $wo_version_new
-    if [[ $? -ne 0 ]]; then
+    if ! {
+        wo -v 2>&1 | grep $wo_version_new
+    }; then
         read -p "Update WordOps to $wo_version_new (y/n): " wo_ans
         if [ "$wo_ans" = "y" ] || [ "$wo_ans" = "Y" ]; then
             wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log
diff --git a/setup.py b/setup.py
index 39ecda6..82c3cde 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.4',
+      version='3.9.5',
       description=long_description,
       long_description=long_description,
       classifiers=[],
diff --git a/wo/core/variables.py b/wo/core/variables.py
index 054ef53..68fab32 100644
--- a/wo/core/variables.py
+++ b/wo/core/variables.py
@@ -11,7 +11,7 @@ class WOVariables():
     """Intialization of core variables"""
 
     # WordOps version
-    wo_version = "3.9.4"
+    wo_version = "3.9.5"
     # WordOps packages versions
     wo_wp_cli = "2.1.0"
     wo_adminer = "4.7.1"