Skip to content

Commit 889cd10

Browse files
author
Kristan Kenney
committed
Merge branch 'bugfix/2020-07_v-change-sys-release' into staging/fixes
2 parents 02856d5 + 2bf9705 commit 889cd10

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

bin/v-change-sys-release

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,14 @@ if [ -z "$branch" ]; then
3535
echo "Error: no release branch specified."
3636
echo "Usage: v-change-sys-release branchname"
3737
echo ""
38-
echo "Common release branches:"
39-
echo "(*) release: The latest stable release available via APT"
40-
echo "(*) prerelease: Beta/release candidate releases"
41-
echo "(*) master: The latest development code from GitHub"
38+
echo "Release branches:"
39+
echo "- release: the latest stable release"
40+
echo "- beta: beta and release candidate test releases"
41+
echo "- develop: unstable development builds"
42+
echo ""
43+
echo "Integration branches (not tied to a specific release/version):"
44+
echo "- staging/fixes: contains new fixes since the last release."
45+
echo "- staging/features: contains new features since the last release."
4246
echo ""
4347
echo "You can also specify another branch name from the"
4448
echo "GitHub repository to install the code from that branch."
@@ -58,7 +62,7 @@ else
5862

5963
# Set new branch variable
6064
echo "RELEASE_BRANCH='$branch'" >> $HESTIA/conf/hestia.conf
61-
echo "Changed system release to update from branch: $branch"
65+
echo "Updated system to update from Git using branch: $branch"
6266
fi
6367

6468
#----------------------------------------------------------#

0 commit comments

Comments
 (0)