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

Modified syntax to be valid for Shellcheck

Browse source
This commit is contained in:
WaLLy3K 2017-05-11 14:19:13 +10:00 committed by GitHub
parent 2863308090
commit c6596f2c54
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
advanced/Scripts/version.sh
View file

@ -16,7 +16,7 @@ WEBGITDIR="/var/www/html/admin/"
getLocalVersion() { getLocalVersion() {
# FTL requires a different method # FTL requires a different method
if [ "$1" == "FTL" ]; then if [ "$1" == "FTL" ]; then
echo $(pihole-FTL version) pihole-FTL version
return 0 return 0
fi fi
@ -25,8 +25,7 @@ getLocalVersion() {
local version local version
cd "${directory}" || { echo "${DEFAULT}"; return 1; } cd "${directory}" || { echo "${DEFAULT}"; return 1; }
version=$(git describe --tags --always || \ version=$(git describe --tags --always || echo "$DEFAULT")
echo "${DEFAULT}")
if [[ "${version}" =~ ^v ]]; then if [[ "${version}" =~ ^v ]]; then
echo "${version}" echo "${version}"
elif [[ "${version}" == "${DEFAULT}" ]]; then elif [[ "${version}" == "${DEFAULT}" ]]; then
@ -50,8 +49,7 @@ getLocalHash() {
local hash local hash
cd "${directory}" || { echo "${DEFAULT}"; return 1; } cd "${directory}" || { echo "${DEFAULT}"; return 1; }
hash=$(git rev-parse --short HEAD || \ hash=$(git rev-parse --short HEAD || echo "$DEFAULT")
echo "${DEFAULT}")
if [[ "${hash}" == "${DEFAULT}" ]]; then if [[ "${hash}" == "${DEFAULT}" ]]; then
echo "ERROR" echo "ERROR"
return 1 return 1
@ -66,7 +64,7 @@ getRemoteVersion(){
local daemon="${1}" local daemon="${1}"
local version local version
version=$(curl --silent --fail https://api.github.com/repos/pi-hole/${daemon}/releases/latest | \ version=$(curl --silent --fail "https://api.github.com/repos/pi-hole/${daemon}/releases/latest" | \
awk -F: '$1 ~/tag_name/ { print $2 }' | \ awk -F: '$1 ~/tag_name/ { print $2 }' | \
tr -cd '[[:alnum:]]._-') tr -cd '[[:alnum:]]._-')
if [[ "${version}" =~ ^v ]]; then if [[ "${version}" =~ ^v ]]; then
@ -79,19 +77,19 @@ getRemoteVersion(){
} }
versionOutput() { versionOutput() {
[ "$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"
[ "$2" == "-c" -o "$2" == "--current" -o -z "$2" ] && current=$(getLocalVersion $GITDIR) [ "$2" == "-c" ] || [ "$2" == "--current" ] || [ -z "$2" ] && current=$(getLocalVersion $GITDIR)
[ "$2" == "-l" -o "$2" == "--latest" -o -z "$2" ] && latest=$(getRemoteVersion $1) [ "$2" == "-l" ] || [ "$2" == "--latest" ] || [ -z "$2" ] && latest=$(getRemoteVersion "$1")
[ "$2" == "-h" -o "$2" == "--hash" ] && hash=$(getLocalHash $GITDIR) [ "$2" == "-h" ] || [ "$2" == "--hash" ] && hash=$(getLocalHash "$GITDIR")
if [ -n "$current" -a -n "$latest" ]; then if [ -n "$current" ] && [ -n "$latest" ]; then
output="${1^} version is $current (Latest: $latest)" output="${1^} version is $current (Latest: $latest)"
elif [ -n "$current" -a -z "$latest" ]; then elif [ -n "$current" ] && [ -z "$latest" ]; then
output="Current ${1^} version is $current" output="Current ${1^} version is $current"
elif [ -z "$current" -a -n "$latest" ]; then elif [ -z "$current" ] && [ -n "$latest" ]; then
output="Latest ${1^} version is $latest" output="Latest ${1^} version is $latest"
elif [ "$hash" == "N/A" ]; then elif [ "$hash" == "N/A" ]; then
output="" output=""