X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=rel%2Ffiles%2Fbin%2Fpleroma_ctl;h=e731d20eb7e6ba27321d70d365870b96d930c4e1;hb=ad8d86e7c600bca65e5f0bb407651d33f1e53043;hp=b0e1874a98c53752c5e5bdb6f6f47f8babd1f8b2;hpb=55742d978d15bba75bcae9c6f2d91afbb77d0dc5;p=akkoma

diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl
index b0e1874a9..e731d20eb 100755
--- a/rel/files/bin/pleroma_ctl
+++ b/rel/files/bin/pleroma_ctl
@@ -2,7 +2,7 @@
 # XXX: This should be removed when elixir's releases get custom command support
 
 detect_flavour() {
-	arch="$(arch)"
+	arch="$(uname -m)"
 	if [ "$arch" = "x86_64" ]; then
 		arch="amd64"
 	elif [ "$arch" = "armv7l" ]; then
@@ -30,12 +30,15 @@ detect_flavour() {
 
 detect_branch() {
 	version="$(cut -d' ' -f2 <"$RELEASE_ROOT"/releases/start_erl.data)"
-	branch="$(echo "$version" | cut -d'-' -f 4)"
+	# Expected format: major.minor.patch_version(-number_of_commits_ahead_of_tag-gcommit_hash).branch
+	branch="$(echo "$version" | cut -d'.' -f 4)"
 	if [ "$branch" = "develop" ]; then
 		echo "develop"
 	elif [ "$branch" = "" ]; then
 		echo "master"
 	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
 		exit 1
 	fi