From 63f3381a2b4f967c1bdf31412868bb770f2c7213 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 2 Mar 2019 16:36:49 +0100
Subject: [PATCH 1/2] Warn user if FTL is not on branch master

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 advanced/Scripts/update.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/advanced/Scripts/update.sh b/advanced/Scripts/update.sh
index 59212a94..85d863a5 100755
--- a/advanced/Scripts/update.sh
+++ b/advanced/Scripts/update.sh
@@ -146,6 +146,20 @@ main() {
         FTL_update=false
     fi
 
+    # Determine FTL branch
+    local ftlBranch
+    if [[ -f "/etc/pihole/ftlbranch" ]]; then
+        ftlBranch=$(</etc/pihole/ftlbranch)
+    else
+        ftlBranch="master"
+    fi
+
+    if [[ ! "${ftlBranch}" == "master" ]]; then
+        # Notify user that they are on a custom branch which might mean they they are lost
+        # behind if a branch was merged to development and got abandoned
+        printf "  %b %bWarning:%b You are using FTL from a custom branch (%s) and might be missing future releases.\\n" "${INFO}" "${COL_LIGHT_RED}" "${COL_NC}" "${ftlBranch}"
+    fi
+
     if [[ "${core_update}" == false && "${web_update}" == false && "${FTL_update}" == false ]]; then
         echo ""
         echo -e "  ${TICK} Everything is up to date!"

From 2e17c233332a27423478e7f394cca3a3bcc24904 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 2 Mar 2019 16:40:59 +0100
Subject: [PATCH 2/2] Don't warn if user is on development as this branch is
 constantly updated

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 advanced/Scripts/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/advanced/Scripts/update.sh b/advanced/Scripts/update.sh
index 85d863a5..4d352777 100755
--- a/advanced/Scripts/update.sh
+++ b/advanced/Scripts/update.sh
@@ -154,7 +154,7 @@ main() {
         ftlBranch="master"
     fi
 
-    if [[ ! "${ftlBranch}" == "master" ]]; then
+    if [[ ! "${ftlBranch}" == "master" && ! "${ftlBranch}" == "development" ]]; then
         # Notify user that they are on a custom branch which might mean they they are lost
         # behind if a branch was merged to development and got abandoned
         printf "  %b %bWarning:%b You are using FTL from a custom branch (%s) and might be missing future releases.\\n" "${INFO}" "${COL_LIGHT_RED}" "${COL_NC}" "${ftlBranch}"