mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-12-25 14:20:18 +00:00
Merge pull request #1293 from pi-hole/fix/version
Account for hash in versioning
This commit is contained in:
Dan Schaper
GitHub
commit
560af43204
1 changed files with 88 additions and 59 deletions
|
|
@ -8,67 +8,98 @@
|
||||||
# This file is copyright under the latest version of the EUPL.
|
# This file is copyright under the latest version of the EUPL.
|
||||||
# Please see LICENSE file for your rights under this license.
|
# Please see LICENSE file for your rights under this license.
|
||||||
|
|
||||||
|
# Variables
|
||||||
|
|
||||||
# Flags:
|
|
||||||
latest=false
|
|
||||||
current=false
|
|
||||||
|
|
||||||
DEFAULT="-1"
|
DEFAULT="-1"
|
||||||
|
PHGITDIR="/etc/.pihole/"
|
||||||
|
WEBGITDIR="/var/www/html/admin/"
|
||||||
|
|
||||||
|
getLocalVersion() {
|
||||||
|
# Get the tagged version of the local repository
|
||||||
|
local directory="${1}"
|
||||||
|
local version
|
||||||
|
|
||||||
|
cd "${directory}" || { echo "${DEFAULT}"; return 1; }
|
||||||
|
version=$(git describe --tags --always || \
|
||||||
|
echo "${DEFAULT}")
|
||||||
|
if [[ "${version}" =~ ^v ]]; then
|
||||||
|
echo "${version}"
|
||||||
|
elif [[ "${version}" == "${DEFAULT}" ]]; then
|
||||||
|
echo "ERROR"
|
||||||
|
return 1
|
||||||
|
else
|
||||||
|
echo "Untagged"
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
getLocalHash() {
|
||||||
|
# Get the short hash of the local repository
|
||||||
|
local directory="${1}"
|
||||||
|
local hash
|
||||||
|
|
||||||
|
cd "${directory}" || { echo "${DEFAULT}"; return 1; }
|
||||||
|
hash=$(git rev-parse --short HEAD || \
|
||||||
|
echo "${DEFAULT}")
|
||||||
|
if [[ "${hash}" == "${DEFAULT}" ]]; then
|
||||||
|
echo "ERROR"
|
||||||
|
return 1
|
||||||
|
else
|
||||||
|
echo "${hash}"
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
getRemoteVersion(){
|
||||||
|
# Get the version from the remote origin
|
||||||
|
local daemon="${1}"
|
||||||
|
local version
|
||||||
|
|
||||||
|
version=$(curl --silent --fail https://api.github.com/repos/pi-hole/${daemon}/releases/latest | \
|
||||||
|
awk -F: '$1 ~/tag_name/ { print $2 }' | \
|
||||||
|
tr -cd '[[:alnum:]]._-')
|
||||||
|
if [[ "${version}" =~ ^v ]]; then
|
||||||
|
echo "${version}"
|
||||||
|
else
|
||||||
|
echo "ERROR"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
#PHHASHLATEST=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/commits/master | \
|
||||||
|
# grep sha | \
|
||||||
|
# head -n1 | \
|
||||||
|
# awk -F ' ' '{ print $2 }' | \
|
||||||
|
# tr -cd '[[:alnum:]]._-')
|
||||||
|
|
||||||
|
#WEBHASHLATEST=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/commits/master | \
|
||||||
|
# grep sha | \
|
||||||
|
# head -n1 | \
|
||||||
|
# awk -F ' ' '{ print $2 }' | \
|
||||||
|
# tr -cd '[[:alnum:]]._-')
|
||||||
|
|
||||||
|
|
||||||
normalOutput() {
|
normalOutput() {
|
||||||
piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
|
echo "::: Pi-hole version is $(getLocalVersion "${PHGITDIR}") (Latest version is $(getRemoteVersion pi-hole))"
|
||||||
webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
|
echo "::: Web-Admin version is $(getLocalVersion "${WEBGITDIR}") (Latest version is $(getRemoteVersion AdminLTE))"
|
||||||
|
|
||||||
piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
|
|
||||||
webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
|
|
||||||
|
|
||||||
echo "::: Pi-hole version is ${piholeVersion} (Latest version is ${piholeVersionLatest:-${DEFAULT}})"
|
|
||||||
echo "::: Web-Admin version is ${webVersion} (Latest version is ${webVersionLatest:-${DEFAULT}})"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
webOutput() {
|
webOutput() {
|
||||||
for var in "$@"; do
|
case "${1}" in
|
||||||
case "${var}" in
|
"-l" | "--latest" ) echo $(getRemoteVersion AdminLTE);;
|
||||||
"-l" | "--latest" ) latest=true;;
|
"-c" | "--current" ) echo $(getLocalVersion "${WEBGITDIR}");;
|
||||||
"-c" | "--current" ) current=true;;
|
"-h" | "--hash" ) echo $(getLocalHash "${WEBGITDIR}");;
|
||||||
* ) echo "::: Invalid Option!"; exit 1;
|
* ) echo "::: Invalid Option!"; exit 1;
|
||||||
esac
|
esac
|
||||||
done
|
|
||||||
|
|
||||||
if [[ "${latest}" == true && "${current}" == false ]]; then
|
|
||||||
webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
|
|
||||||
echo "${webVersionLatest:--1}"
|
|
||||||
elif [[ "${latest}" == false && "${current}" == true ]]; then
|
|
||||||
webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
|
|
||||||
echo "${webVersion}"
|
|
||||||
else
|
|
||||||
webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
|
|
||||||
webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
|
|
||||||
echo "::: Web-Admin version is ${webVersion} (Latest version is ${webVersionLatest:-${DEFAULT}})"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
coreOutput() {
|
coreOutput() {
|
||||||
for var in "$@"; do
|
case "${1}" in
|
||||||
case "${var}" in
|
"-l" | "--latest" ) echo $(getRemoteVersion pi-hole);;
|
||||||
"-l" | "--latest" ) latest=true;;
|
"-c" | "--current" ) echo $(getLocalVersion "${PHGITDIR}");;
|
||||||
"-c" | "--current" ) current=true;;
|
"-h" | "--hash" ) echo $(getLocalHash "${PHGITDIR}");;
|
||||||
* ) echo "::: Invalid Option!"; exit 1;
|
* ) echo "::: Invalid Option!"; exit 1;
|
||||||
esac
|
esac
|
||||||
done
|
|
||||||
|
|
||||||
if [[ "${latest}" == true && "${current}" == false ]]; then
|
|
||||||
piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
|
|
||||||
echo "${piholeVersionLatest:--1}"
|
|
||||||
elif [[ "${latest}" == false && "${current}" == true ]]; then
|
|
||||||
piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
|
|
||||||
echo "${piholeVersion}"
|
|
||||||
else
|
|
||||||
piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
|
|
||||||
piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
|
|
||||||
echo "::: Pi-hole version is ${piholeVersion} (Latest version is ${piholeVersionLatest:-${DEFAULT}})"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
helpFunc() {
|
helpFunc() {
|
||||||
|
|
@ -93,10 +124,8 @@ if [[ $# = 0 ]]; then
|
||||||
normalOutput
|
normalOutput
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for var in "$@"; do
|
case "${1}" in
|
||||||
case "${var}" in
|
"-a" | "--admin" ) shift; webOutput "$@";;
|
||||||
"-a" | "--admin" ) shift; webOutput "$@";;
|
"-p" | "--pihole" ) shift; coreOutput "$@" ;;
|
||||||
"-p" | "--pihole" ) shift; coreOutput "$@" ;;
|
"-h" | "--help" ) helpFunc;;
|
||||||
"-h" | "--help" ) helpFunc;;
|
esac
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue