From 246d5cd5879863d7049d6f17832ea11e4b0b642b Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 7 Mar 2018 21:41:00 +0000 Subject: [PATCH 1/2] store checked out FTL branch in /etc/pihole/ftlbranch Signed-off-by: Adam Warner --- advanced/Scripts/piholeCheckout.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh index 9e97c69c..423114b1 100644 --- a/advanced/Scripts/piholeCheckout.sh +++ b/advanced/Scripts/piholeCheckout.sh @@ -332,6 +332,7 @@ checkout() { if check_download_exists "$path"; then echo " ${TICK} Branch ${2} exists" + echo "${2}" > /etc/pihole/ftlbranch FTLinstall "${binary}" "${path}" else echo " ${CROSS} Requested branch \"${2}\" is not available" From 76cb129d3c9310077cbb29e2323fde35fbd2e0a0 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 7 Mar 2018 21:48:09 +0000 Subject: [PATCH 2/2] don't forget `master` and `development` branches! Signed-off-by: Adam Warner --- advanced/Scripts/piholeCheckout.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh index 423114b1..21919ddf 100644 --- a/advanced/Scripts/piholeCheckout.sh +++ b/advanced/Scripts/piholeCheckout.sh @@ -256,6 +256,7 @@ checkout() { get_binary_name local path path="development/${binary}" + echo "development" > /etc/pihole/ftlbranch FTLinstall "${binary}" "${path}" elif [[ "${1}" == "master" ]] ; then # Shortcut to check out master branches @@ -270,6 +271,7 @@ checkout() { get_binary_name local path path="master/${binary}" + echo "master" > /etc/pihole/ftlbranch FTLinstall "${binary}" "${path}" elif [[ "${1}" == "core" ]] ; then str="Fetching branches from ${piholeGitUrl}"