Change release branching structure

release:      The latest stable release available via APT
prerelease:   Beta/release candidate releases
master:       The latest development code from GitHub

Author: Kristan Kenney

bin/v-change-sys-release

@@ -27,8 +27,9 @@ if [ -z "$branch" ]; then
     echo "Usage: v-change-sys-release branchname"
     echo ""
     echo "Common release branches:"
-    echo "(*) master:   Stable releases only"
-    echo "(*) develop:  Daily development builds"
+    echo "(*) release:      The latest stable release available via APT"
+    echo "(*) prerelease:   Beta/release candidate releases"
+    echo "(*) master:       The latest development code from GitHub"
     echo ""
     echo "You can also specify another branch name from the"
     echo "GitHub repository to install the code from that branch."
@@ -48,7 +49,7 @@ else
 
     # Set new branch variable
     echo "RELEASE_BRANCH='$branch'" >> $HESTIA/conf/hestia.conf
-    echo "Changed system release to update from Git branch: $branch"
+    echo "Changed system release to update from branch: $branch"
 fi
 
 #----------------------------------------------------------#

install/hst-install-debian.sh

@@ -1068,7 +1068,7 @@ echo "LANGUAGE='$lang'" >> $HESTIA/conf/hestia.conf
 
 # Version & Release Branch
 echo "VERSION='1.0.1'" >> $HESTIA/conf/hestia.conf
-echo "RELEASE_BRANCH='master'" >> $HESTIA/conf/hestia.conf
+echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
 
 # Installing hosting packages
 cp -rf $hestiacp/packages $HESTIA/data/

install/hst-install-ubuntu.sh

@@ -1033,7 +1033,7 @@ echo "LANGUAGE='$lang'" >> $HESTIA/conf/hestia.conf
 
 # Version & Release Branch
 echo "VERSION='1.0.1'" >> $HESTIA/conf/hestia.conf
-echo "RELEASE_BRANCH='master'" >> $HESTIA/conf/hestia.conf
+echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
 
 # Installing hosting packages
 cp -rf $hestiacp/packages $HESTIA/data/

install/upgrade/version.sh

@@ -5,7 +5,7 @@ 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
+    echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
 fi
 
 # Step through version upgrade scripts in order as necessary to ensure that systems