Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 14:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present.

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2020-04-21 08:51:17 +02:00
parent 3cc9ba4ee8
commit 176fbaf83b
No known key found for this signature in database
GPG key ID: FB60471F0575164A
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
advanced/Scripts/version.sh
View file

@ -119,7 +119,7 @@ getLocalBranch(){
# Local FTL btranch is stored in /etc/pihole/ftlbranch # Local FTL btranch is stored in /etc/pihole/ftlbranch
if [[ "$1" == "FTL" ]]; then if [[ "$1" == "FTL" ]]; then
branch=$(cat /etc/pihole/ftlbranch) branch="$(pihole-FTL branch)"
else else
cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; } cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; }
branch=$(git rev-parse --abbrev-ref HEAD || echo "$DEFAULT") branch=$(git rev-parse --abbrev-ref HEAD || echo "$DEFAULT")