Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-01 13:10:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix https://github.com/pi-hole/pi-hole/issues/4279

Browse source 
Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>
This commit is contained in:
Subhaditya Nath 2021-08-15 17:43:20 +05:30
parent 98867d8d71
commit e8079620f5
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
advanced/Scripts/version.sh
View file

@ -91,11 +91,19 @@ getRemoteVersion(){
#If the above file exists, then we can read from that. Prevents overuse of GitHub API #If the above file exists, then we can read from that. Prevents overuse of GitHub API
if [[ -f "$cachedVersions" ]]; then if [[ -f "$cachedVersions" ]]; then
IFS=' ' read -r -a arrCache < "$cachedVersions" IFS=' ' read -r -a arrCache < "$cachedVersions"
case $daemon in
"pi-hole" ) echo "${arrCache[0]}";; if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
"AdminLTE" ) echo "${arrCache[1]}";; case $daemon in
"FTL" ) echo "${arrCache[2]}";; "pi-hole" ) echo "${arrCache[0]}";;
esac "AdminLTE" ) echo "${arrCache[1]}";;
"FTL" ) echo "${arrCache[2]}";;
esac
else
case $daemon in
"pi-hole" ) echo "${arrCache[0]}";;
"FTL" ) echo "${arrCache[1]}";;
esac
fi
return 0 return 0
fi fi
@ -140,6 +148,11 @@ getLocalBranch(){
} }
versionOutput() { versionOutput() {
[[ "$1" == "AdminLTE" ]] && [[ "${INSTALL_WEB_INTERFACE}" != true ]] && {
echo " WebAdmin not installed"
return 1
}
[[ "$1" == "pi-hole" ]] && GITDIR=$COREGITDIR [[ "$1" == "pi-hole" ]] && GITDIR=$COREGITDIR
[[ "$1" == "AdminLTE" ]] && GITDIR=$WEBGITDIR [[ "$1" == "AdminLTE" ]] && GITDIR=$WEBGITDIR
[[ "$1" == "FTL" ]] && GITDIR="FTL" [[ "$1" == "FTL" ]] && GITDIR="FTL"