From: rinpatch <rinpatch@sdf.org>
Date: Mon, 14 Oct 2019 15:39:56 +0000 (+0300)
Subject: Prepare pleroma_ctl for moving master to stable and relax the error
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=bbe409c914c413fd8e218b2b2ea64523c0ec9b43;p=akkoma

Prepare pleroma_ctl for moving master to stable and relax the error
message
---

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
 }