arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-23 07:18:07 +00:00
Code Issues Releases Wiki Activity

Update -h to work as --hash

Browse Source 
Also provide error output as per https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093
This commit is contained in:
WaLLy3K 2017-05-11 08:30:49 +10:00 committed by GitHub
parent 03201e2f20
commit fe0a35cc7a
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
advanced/Scripts/version.sh
View File

@ -69,7 +69,8 @@ getRemoteVersion(){
coreOutput() { coreOutput() {
[ "$1" = "-c" -o "$1" = "--current" -o -z "$1" ] && current="$(getLocalVersion ${PHGITDIR})" [ "$1" = "-c" -o "$1" = "--current" -o -z "$1" ] && current="$(getLocalVersion ${PHGITDIR})"
[ "$1" = "-l" -o "$1" = "--latest" -o -z "$1" ] && latest="$(getRemoteVersion pi-hole)" [ "$1" = "-l" -o "$1" = "--latest" -o -z "$1" ] && latest="$(getRemoteVersion pi-hole)"
[ "$1" = "--hash" ] && hash="$(getLocalHash ${PHGITDIR})" [ "$1" = "-h" -o "$1" = "--hash" ] && hash="$(getLocalHash ${PHGITDIR})"
[ -n "$2" ] && error="true"
if [ -n "$current" -a -n "$latest" ]; then if [ -n "$current" -a -n "$latest" ]; then
str="Pi-hole version is $current (Latest: $latest)" str="Pi-hole version is $current (Latest: $latest)"
@ -80,17 +81,24 @@ coreOutput() {
elif [ -n "$hash" ]; then elif [ -n "$hash" ]; then
str="Current Pi-hole hash is $hash" str="Current Pi-hole hash is $hash"
else else
echo " Invalid Option! Try 'pihole -v --help' for more information." error="true"
exit 1
fi fi
if [ "$error" = "true" ]; then
echo " Invalid Option! Try 'pihole -v --help' for more information."
exit 1
fi
echo " $str" echo " $str"
} }
webOutput() { webOutput() {
[ "$1" = "-c" -o "$1" = "--current" -o -z "$1" ] && current="$(getLocalVersion ${WEBGITDIR})" [ "$1" = "-c" -o "$1" = "--current" -o -z "$1" ] && current="$(getLocalVersion ${WEBGITDIR})"
[ "$1" = "-l" -o "$1" = "--latest" -o -z "$1" ] && latest="$(getRemoteVersion AdminLTE)" [ "$1" = "-l" -o "$1" = "--latest" -o -z "$1" ] && latest="$(getRemoteVersion AdminLTE)"
[ "$1" = "--hash" ] && hash="$(getLocalHash ${WEBGITDIR})" [ "$1" = "-h" -o "$1" = "--hash" ] && hash="$(getLocalHash ${WEBGITDIR})"
[ ! -d "${WEBGITDIR}" ] && str="Web interface not installed!" [ ! -d "${WEBGITDIR}" ] && str="Web interface not installed!"
[ -n "$2" ] && error="true"
if [ -n "$current" -a -n "$latest" ]; then if [ -n "$current" -a -n "$latest" ]; then
str="Admin Console version is $current (Latest: $latest)" str="Admin Console version is $current (Latest: $latest)"
@ -101,9 +109,14 @@ webOutput() {
elif [ -n "$hash" ]; then elif [ -n "$hash" ]; then
str="Current Admin Console hash is $hash" str="Current Admin Console hash is $hash"
else else
echo " Invalid Option! Try 'pihole -v --help' for more information." error="true"
exit 1
fi fi
if [ "$error" = "true" ]; then
echo " Invalid Option! Try 'pihole -v --help' for more information."
exit 1
fi
echo " $str" echo " $str"
} }
@ -111,6 +124,7 @@ ftlOutput() {
[ "$1" = "-c" -o "$1" = "--current" -o -z "$1" ] && current="$(pihole-FTL version)" [ "$1" = "-c" -o "$1" = "--current" -o -z "$1" ] && current="$(pihole-FTL version)"
[ "$1" = "-l" -o "$1" = "--latest" -o -z "$1" ] && latest="$(getRemoteVersion FTL)" [ "$1" = "-l" -o "$1" = "--latest" -o -z "$1" ] && latest="$(getRemoteVersion FTL)"
[ ! -d "${WEBGITDIR}" ] && exit 0 [ ! -d "${WEBGITDIR}" ] && exit 0
[ -n "$2" ] && error="true"
if [ -n "$current" -a -n "$latest" ]; then if [ -n "$current" -a -n "$latest" ]; then
str="FTL version is $current (Latest: $latest)" str="FTL version is $current (Latest: $latest)"
@ -119,16 +133,21 @@ ftlOutput() {
elif [ -z "$current" -a -n "$latest" ]; then elif [ -z "$current" -a -n "$latest" ]; then
str="Latest FTL version is $latest" str="Latest FTL version is $latest"
else else
echo " Invalid Option! Try 'pihole -v --help' for more information." error="true"
exit 1
fi fi
if [ "$error" = "true" ]; then
echo " Invalid Option! Try 'pihole -v --help' for more information."
exit 1
fi
echo " $str" echo " $str"
} }
defaultOutput() { defaultOutput() {
coreOutput "$1" coreOutput "$1" "$2"
webOutput "$1" webOutput "$1" "$2"
ftlOutput "$1" ftlOutput "$1" "$2"
} }
helpFunc() { helpFunc() {