summaryrefslogtreecommitdiff
path: root/rel
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-10-14 18:39:56 +0300
committerrinpatch <rinpatch@sdf.org>2019-10-14 19:34:06 +0300
commitbbe409c914c413fd8e218b2b2ea64523c0ec9b43 (patch)
tree45b99d2ea7de4e225083a1d0a2da5ab9c89ebb6e /rel
parent3d3c166e590f74f4cd79cb62b0ddab369a796165 (diff)
Prepare pleroma_ctl for moving master to stable and relax the error
message
Diffstat (limited to 'rel')
-rwxr-xr-xrel/files/bin/pleroma_ctl4
1 files changed, 2 insertions, 2 deletions
diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl
index f767fe134..90f87a990 100755
--- a/rel/files/bin/pleroma_ctl
+++ b/rel/files/bin/pleroma_ctl
@@ -35,11 +35,11 @@ detect_branch() {
if [ "$branch" = "develop" ]; then
echo "develop"
elif [ "$branch" = "" ]; then
- echo "master"
+ echo "stable"
else
# Note: branch name in version is of SemVer format and may only contain [0-9a-zA-Z-] symbols —
# if supporting releases for more branches, need to ensure they contain only these symbols.
- echo "Releases are built only for master and develop branches" >&2
+ echo "Can't detect the branch automatically, please specify it by using the --branch option." >&2
exit 1
fi
}