Optimize code, undoc flag for current hash.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
pull/1293/head
Dan Schaper 7 years ago
parent 9bb4a5fb25
commit 0341bd1758
No known key found for this signature in database
GPG Key ID: 572E999E385B7BFC

@ -50,37 +50,23 @@ normalOutput() {
webOutput() { webOutput() {
for var in "$@"; do for var in "$@"; do
case "${var}" in case "${var}" in
"-l" | "--latest" ) latest=true;; "-l" | "--latest" ) echo "${WEBVERSIONLATEST:--1}";;
"-c" | "--current" ) current=true;; "-c" | "--current" ) echo "${WEBVERSION}";;
"-h" | "--hash" ) echo "${WEBHASH}";;
* ) echo "::: Invalid Option!"; exit 1; * ) echo "::: Invalid Option!"; exit 1;
esac esac
done done
if [[ "${latest}" == true && "${current}" == false ]]; then
echo "${WEBVERSIONLATEST:--1}"
elif [[ "${latest}" == false && "${current}" == true ]]; then
echo "${WEBVERSION}"
else
echo "::: Web-Admin version is ${WEBVERSION} (Latest version is ${WEBVERSIONLATEST:-${DEFAULT}})"
fi
} }
coreOutput() { coreOutput() {
for var in "$@"; do for var in "$@"; do
case "${var}" in case "${var}" in
"-l" | "--latest" ) latest=true;; "-l" | "--latest" ) echo "${PHVERSIONLATEST:--1}";;
"-c" | "--current" ) current=true;; "-c" | "--current" ) echo "${PHVERSION}";;
"-h" | "--hash" ) echo "${PHHASH}";;
* ) echo "::: Invalid Option!"; exit 1; * ) echo "::: Invalid Option!"; exit 1;
esac esac
done done
if [[ "${latest}" == true && "${current}" == false ]]; then
echo "${PHVERSIONLATEST:--1}"
elif [[ "${latest}" == false && "${current}" == true ]]; then
echo "${PHVERSION}"
else
echo "::: Pi-hole version is ${PHVERSION} (Latest version is ${PHVERSIONLATEST:-${DEFAULT}})"
fi
} }
helpFunc() { helpFunc() {

Loading…
Cancel
Save