mirror of
https://github.com/pi-hole/pi-hole
synced 2024-12-22 23:08:07 +00:00
Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present.
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
parent
3cc9ba4ee8
commit
176fbaf83b
@ -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")
|
||||||
|
Loading…
Reference in New Issue
Block a user