From 176fbaf83bb3034ba7b19656d23a1d147a0686da Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 21 Apr 2020 08:51:17 +0200 Subject: [PATCH] Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present. Signed-off-by: DL6ER --- advanced/Scripts/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced/Scripts/version.sh b/advanced/Scripts/version.sh index 2c4abd0b..f79d5614 100755 --- a/advanced/Scripts/version.sh +++ b/advanced/Scripts/version.sh @@ -119,7 +119,7 @@ getLocalBranch(){ # Local FTL btranch is stored in /etc/pihole/ftlbranch if [[ "$1" == "FTL" ]]; then - branch=$(cat /etc/pihole/ftlbranch) + branch="$(pihole-FTL branch)" else cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; } branch=$(git rev-parse --abbrev-ref HEAD || echo "$DEFAULT")