From db7915957d0292b4985c853643ede6a813b98505 Mon Sep 17 00:00:00 2001
From: Nico <freifunk@nicoboehr.de>
Date: Tue, 7 Jan 2020 07:40:50 +0000
Subject: [PATCH] Make Gluon major version configurable

---
 update-gluon.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/update-gluon.sh b/update-gluon.sh
index 93d2123..a8011c8 100755
--- a/update-gluon.sh
+++ b/update-gluon.sh
@@ -4,11 +4,13 @@ set -x
 set -eu
 set -o pipefail
 
+gluon_major="v2019.1"
+
 gluon_fork_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/gluon.git"
 gluon_upstream_git_url="https://github.com/freifunk-gluon/gluon.git"
 site_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/site-ffs.git"
 
-upstream_newest_minor=$(git ls-remote --tags --refs "$gluon_upstream_git_url" 'refs/tags/v2018.2*' | cut -d/ -f3 | sort -r -n -t. -k2 | head -n1)
+upstream_newest_minor=$(git ls-remote --tags --refs "$gluon_upstream_git_url" "refs/tags/$gluon_major\*" | cut -d/ -f3 | sort -r -n -t. -k2 | head -n1)
 # branch name in our forked gluon
 fork_newest_minor_branch="$upstream_newest_minor-ffs"
 fork_newest_minor_tag="$upstream_newest_minor-ffs0.1"
@@ -38,7 +40,7 @@ cd ..
 git clone --recurse "$site_git_url"
 
 cd site-ffs
-git checkout nightly
+git checkout "gluon-$gluon_major"
 
 git submodule sync
 git submodule update
-- 
GitLab