ffhb/gluon-site-ffhb
ffhb
/
gluon-site-ffhb
mirror of https://github.com/FreifunkBremen/gluon-site-ffhb.git
1
1
Fork 0
Code Issues Releases Wiki Activity

build.sh: release name Vorschlag Algorithmus gefixed 

basierend auf dem gewählten branch, wird jetzt die letzte Version dessen ausgeworfen, statt immer der von testing
die if conditions zum Ermitteln, ob eine neue gluon Version eingesetzt wird, laufen jetzt richtig durch und geben den richtigen release name Vorschlag aus, nicht immer nur der für testing
This commit is contained in:
Simon Joda Stößer 2015-12-13 04:14:54 +01:00
parent 57e582d500
commit d81d9e8868
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sh
View File

@ -94,13 +94,17 @@ if ! $cont; then
echo "Building Gluon ${GLUON_TAG} as ${GLUON_BRANCH}" echo "Building Gluon ${GLUON_TAG} as ${GLUON_BRANCH}"
last_release_testing="$(get_last_release testing)" last_release_testing="$(get_last_release testing)"
last_release_stable="$(get_last_release stable)" last_release_stable="$(get_last_release stable)"
if [ "${GLUON_BRANCH}" = "testing" ]; then
echo "Last release in branch testing was ${last_release_testing}" echo "Last release in branch testing was ${last_release_testing}"
if is_based_on "$last_release_testing" "$GLUON_TAG"; then elif [ "${GLUON_BRANCH}" = "stable" ]; then
local_version="$(extract_local_version "$last_release_testing")" echo "Last release in branch stable was ${last_release_stable}"
if [ "$GLUON_BRANCH" != "stable" ]; then
local_version="$(($local_version + 1))"
fi fi
if [ "$GLUON_BRANCH" = "testing" ] && is_based_on "$last_release_testing" "$GLUON_TAG"; then
# same gluon version for new testing=> local version number +1
local_version="$(extract_local_version "$last_release_testing")"
local_version="$(($local_version + 1))"
elif [ "$GLUON_BRANCH" = "stable" ] && is_based_on "$last_release_stable" "$GLUON_TAG"; then elif [ "$GLUON_BRANCH" = "stable" ] && is_based_on "$last_release_stable" "$GLUON_TAG"; then
# same gluon version for new stable => local version number +1
local_version="$(extract_local_version "$last_release_stable")" local_version="$(extract_local_version "$last_release_stable")"
local_version="$(($local_version + 1))" local_version="$(($local_version + 1))"
else else