diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-07-06 10:17:06 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-07-06 10:17:06 +0300 |
| commit | ad8d86e7c600bca65e5f0bb407651d33f1e53043 (patch) | |
| tree | 75c395c888a10bad571769eaf828d989c2a5b2c4 /rel/files/bin | |
| parent | a7994185739522dee80e22f76e5fdac1a3b8279b (diff) | |
| parent | 3589b30ddc9d0c23ca6f00264cff05e53be1b270 (diff) | |
| download | pleroma-ad8d86e7c600bca65e5f0bb407651d33f1e53043.tar.gz pleroma-ad8d86e7c600bca65e5f0bb407651d33f1e53043.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
Diffstat (limited to 'rel/files/bin')
| -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 |