1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-18 06:08:21 +00:00

Generate only the information that is actually asked for

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

View File

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