From 340957899556547c84160cf45c9789847e7aa303 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 25 Oct 2017 00:37:36 +0900
Subject: [PATCH] Also consider Syncthing rc releases if we are building beta
 or rc

---
 prepare-release.bash                         | 11 ++++++++---
 syncthing/src/github.com/syncthing/syncthing |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/prepare-release.bash b/prepare-release.bash
index cfec2ee1..fa8ba7c2 100755
--- a/prepare-release.bash
+++ b/prepare-release.bash
@@ -19,9 +19,14 @@ PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "syncthing/src/github.com/syncthing/syncthing/"
 git fetch
 CURRENT_TAG=$(git describe)
-LATEST_TAG=$(git tag --sort=taggerdate | awk '!/rc/' | tail -1)
-if [ ${CURRENT_TAG} != ${LATEST_TAG} ]
-then
+# Also consider Syncthing rc releases if we are building beta or rc.
+if [[ "$NEW_VERSION_NAME" == *beta* ]] || [[ "$NEW_VERSION_NAME" == *rc* ]]; then
+    LATEST_TAG=$(git tag --sort=taggerdate | tail -1)
+else
+    LATEST_TAG=$(git tag --sort=taggerdate | awk '!/rc/' | tail -1)
+fi
+
+if [ ${CURRENT_TAG} != ${LATEST_TAG} ]; then
     git checkout -f ${LATEST_TAG}
     cd ${PROJECT_DIR}
     git add "syncthing/src/github.com/syncthing/syncthing/"
diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing
index 5aade9a4..dc42db44 160000
--- a/syncthing/src/github.com/syncthing/syncthing
+++ b/syncthing/src/github.com/syncthing/syncthing
@@ -1 +1 @@
-Subproject commit 5aade9a4a5506e5b71b2a9ab863790dca488700e
+Subproject commit dc42db444b17145b7de9a0d1c56a42b9d64f3dea