projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies...
[akkoma]
/
rel
/
files
/
bin
/
pleroma_ctl
diff --git
a/rel/files/bin/pleroma_ctl
b/rel/files/bin/pleroma_ctl
index 9c67b209b95ccff744455e92055e7a7974735304..e731d20eb7e6ba27321d70d365870b96d930c4e1 100755
(executable)
--- a/
rel/files/bin/pleroma_ctl
+++ b/
rel/files/bin/pleroma_ctl
@@
-30,12
+30,15
@@
detect_flavour() {
detect_branch() {
version="$(cut -d' ' -f2 <"$RELEASE_ROOT"/releases/start_erl.data)"
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
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
echo "Releases are built only for master and develop branches" >&2
exit 1
fi