Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Generate only the information that is actually asked for

Browse source
This commit is contained in:
DL6ER 2017-03-04 14:08:11 +01:00
parent 0e8fd49669
commit b85af50d14
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
advanced/Scripts/version.sh
View file

@ -86,18 +86,18 @@ normalOutput() {
webOutput() { webOutput() {
case "${1}" in case "${1}" in
"-l" | "--latest" ) echo "${WEBVERSIONLATEST}";; "-l" | "--latest" ) echo $(getRemoteVersion AdminLTE);;
"-c" | "--current" ) echo "${WEBVERSION}";; "-c" | "--current" ) echo $(getLocalVersion "${WEBGITDIR}");;
"-h" | "--hash" ) echo "${WEBHASH}";; "-h" | "--hash" ) echo $(getLocalHash "${WEBGITDIR}");;
* ) echo "::: Invalid Option!"; exit 1; * ) echo "::: Invalid Option!"; exit 1;
esac esac
} }
coreOutput() { coreOutput() {
case "${1}" in case "${1}" in
"-l" | "--latest" ) echo "${PHVERSIONLATEST}";; "-l" | "--latest" ) echo $(getRemoteVersion pi-hole);;
"-c" | "--current" ) echo "${PHVERSION}";; "-c" | "--current" ) echo $(getLocalVersion "${PHGITDIR}");;
"-h" | "--hash" ) echo "${PHHASH}";; "-h" | "--hash" ) echo $(getLocalHash "${PHGITDIR}");;
* ) echo "::: Invalid Option!"; exit 1; * ) echo "::: Invalid Option!"; exit 1;
esac esac
} }
@ -120,13 +120,6 @@ EOM
exit 0 exit 0
} }
PHVERSION=$(getLocalVersion "${PHGITDIR}")
PHHASH=$(getLocalHash "${PHGITDIR}")
PHVERSIONLATEST=$(getRemoteVersion pi-hole)
WEBVERSION=$(getLocalVersion "${WEBGITDIR}")
WEBHASH=$(getLocalHash "${WEBGITDIR}")
WEBVERSIONLATEST=$(getRemoteVersion AdminLTE)
if [[ $# = 0 ]]; then if [[ $# = 0 ]]; then
normalOutput normalOutput
fi fi