Merge branch 'release-1.0.1-scripts' into release-1.0.1

Author: Kristan Kenney

bin/v-change-sys-release

@@ -28,7 +28,6 @@ if [ -z "$branch" ]; then
     echo ""
     echo "Common release branches:"
     echo "(*) master:   Stable releases only"
-    echo "(*) beta:     Beta builds which are being prepared for release"
     echo "(*) develop:  Daily development builds"
     echo ""
     echo "You can also specify another branch name from the"

install/hst-install-debian.sh

@@ -1067,8 +1067,8 @@ echo "BACKUP_SYSTEM='local'" >> $HESTIA/conf/hestia.conf
 echo "LANGUAGE='$lang'" >> $HESTIA/conf/hestia.conf
 
 # Version & Release Branch
-echo "VERSION='1.00.0-190618'" >> $HESTIA/conf/hestia.conf
-echo "RELEASE_BRANCH='develop'" >> $HESTIA/conf/hestia.conf
+echo "VERSION='1.0.1'" >> $HESTIA/conf/hestia.conf
+echo "RELEASE_BRANCH='master'" >> $HESTIA/conf/hestia.conf
 
 # Installing hosting packages
 cp -rf $hestiacp/packages $HESTIA/data/

install/hst-install-ubuntu.sh

@@ -1032,8 +1032,8 @@ echo "BACKUP_SYSTEM='local'" >> $HESTIA/conf/hestia.conf
 echo "LANGUAGE='$lang'" >> $HESTIA/conf/hestia.conf
 
 # Version & Release Branch
-echo "VERSION='1.00.0-190618'" >> $HESTIA/conf/hestia.conf
-echo "RELEASE_BRANCH='develop'" >> $HESTIA/conf/hestia.conf
+echo "VERSION='1.0.1'" >> $HESTIA/conf/hestia.conf
+echo "RELEASE_BRANCH='master'" >> $HESTIA/conf/hestia.conf
 
 # Installing hosting packages
 cp -rf $hestiacp/packages $HESTIA/data/

install/upgrade/messages.sh

@@ -8,7 +8,7 @@ function welcome_message() {
     echo '    |_| |_|\___||___/\__|_|\__,_|\____|_|          '
     echo ""
     echo "       Hestia Control Panel Upgrade Script"
-    echo "             Version: $version                     "
+    echo "                 Version: $version                 "
     echo "==================================================="
     echo ""
     echo "Existing files will be backed up to the following location:"

install/upgrade/version.sh

@@ -1,5 +1,15 @@
 #!/bin/bash
 
+# Add release branch system configuration if non-existent
+release_branch_check=$(cat $HESTIA/conf/hestia.conf | grep RELEASE_BRANCH)
+if [ -z "$release_branch_check" ]; then
+    echo "(*) Adding global release branch variable to system configuration..."
+    sed -i "/RELEASE_BRANCH/d" $HESTIA/conf/hestia.conf
+    echo "RELEASE_BRANCH='master'" >> $HESTIA/conf/hestia.conf
+fi
+
+# Step through version upgrade scripts in order as necessary to ensure that systems
+# are properly upgraded if skipping versions.
 if [ $VERSION = "$version" ]; then
     echo "(!) The latest version of Hestia Control Panel ($version) is already installed."
     echo "    Verifying configuration..."
@@ -15,7 +25,7 @@ if [ $VERSION = "0.9.8-28" ]; then
     source /usr/local/hestia/install/upgrade/versions/1.00.0-190618.sh
     VERSION="1.00.0-190618"
 fi
-if [ $VERSION = "0.10.00" ] || [ $VERSION = "1.00.0-190618" ]; then
+if [ $VERSION = "0.10.00" ] || [ $VERSION = "1.00.0-190618" ] || [ $VERSION = "1.00.0-190621" ]; then
     source /usr/local/hestia/install/upgrade/versions/$version.sh
     VERSION="$version"
 fi

install/upgrade/versions/1.00.0-190621.sh install/upgrade/versions/1.0.1.shinstall/upgrade/versions/1.00.0-190621.sh renamed to install/upgrade/versions/1.0.1.sh

@@ -27,14 +27,6 @@ if [ ! -z "$imap_check" ]; then
     fi
 fi
 
-# Add release branch system configuration if non-existent
-release_branch_check=$(cat $HESTIA/conf/hestia.conf | grep RELEASE_BRANCH)
-if [ -z "$release_branch_check" ]; then
-    echo "(*) Adding global release branch variable to system configuration..."
-    sed -i "/RELEASE_BRANCH/d" $HESTIA/conf/hestia.conf
-    echo "RELEASE_BRANCH='develop'" >> $HESTIA/conf/hestia.conf
-fi
-
 # Load global variables
 source $HESTIA/conf/hestia.conf
 

install/upgrade/versions/1.00.0-190618.sh

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.00.0-190621
+Version: 1.0.1
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com