diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-31 15:13:38 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-31 15:13:38 +0000 |
| commit | cca9d64cb819149c9c48978e8e8571f99af2ef5b (patch) | |
| tree | 3002f50a53b1b0b4a229e7f3b65cbc0c27a75941 /rel | |
| parent | ce6dfb6f066616553d8594fd6ffadcc96ad1daff (diff) | |
| parent | daf0d0dd9a54d1f493017434e0854816f0681001 (diff) | |
| download | pleroma-cca9d64cb819149c9c48978e8e8571f99af2ef5b.tar.gz | |
Merge branch '1048-semver-format-compliance-backport' into 'master'
Fixed version parsing in pleroma_ctl (backport)
See merge request pleroma/pleroma!1508
Diffstat (limited to 'rel')
| -rwxr-xr-x | rel/files/bin/pleroma_ctl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl index 9c67b209b..e731d20eb 100755 --- 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)" - 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 |