|
|
|
|
@ -10,17 +10,22 @@
|
|
|
|
|
|
|
|
|
|
# Variables
|
|
|
|
|
DEFAULT="-1"
|
|
|
|
|
PHGITDIR="/etc/.pihole/"
|
|
|
|
|
COREGITDIR="/etc/.pihole/"
|
|
|
|
|
WEBGITDIR="/var/www/html/admin/"
|
|
|
|
|
|
|
|
|
|
getLocalVersion() {
|
|
|
|
|
# FTL requires a different method
|
|
|
|
|
if [[ "$1" == "FTL" ]]; then
|
|
|
|
|
pihole-FTL version
|
|
|
|
|
return 0
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# 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}")
|
|
|
|
|
cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; }
|
|
|
|
|
version=$(git describe --tags --always || echo "$DEFAULT")
|
|
|
|
|
if [[ "${version}" =~ ^v ]]; then
|
|
|
|
|
echo "${version}"
|
|
|
|
|
elif [[ "${version}" == "${DEFAULT}" ]]; then
|
|
|
|
|
@ -33,13 +38,18 @@ getLocalVersion() {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
getLocalHash() {
|
|
|
|
|
# Local FTL hash does not exist on filesystem
|
|
|
|
|
if [[ "$1" == "FTL" ]]; then
|
|
|
|
|
echo "N/A"
|
|
|
|
|
return 0
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# 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}")
|
|
|
|
|
cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; }
|
|
|
|
|
hash=$(git rev-parse --short HEAD || echo "$DEFAULT")
|
|
|
|
|
if [[ "${hash}" == "${DEFAULT}" ]]; then
|
|
|
|
|
echo "ERROR"
|
|
|
|
|
return 1
|
|
|
|
|
@ -49,12 +59,33 @@ getLocalHash() {
|
|
|
|
|
return 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
getRemoteHash(){
|
|
|
|
|
# Remote FTL hash is not applicable
|
|
|
|
|
if [[ "$1" == "FTL" ]]; then
|
|
|
|
|
echo "N/A"
|
|
|
|
|
return 0
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
local daemon="${1}"
|
|
|
|
|
local branch="${2}"
|
|
|
|
|
|
|
|
|
|
hash=$(git ls-remote --heads "https://github.com/pi-hole/${daemon}" | \
|
|
|
|
|
awk -v bra="$branch" '$0~bra {print substr($0,0,8);exit}')
|
|
|
|
|
if [[ -n "$hash" ]]; then
|
|
|
|
|
echo "$hash"
|
|
|
|
|
else
|
|
|
|
|
echo "ERROR"
|
|
|
|
|
return 1
|
|
|
|
|
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 | \
|
|
|
|
|
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
|
|
|
|
|
@ -66,72 +97,72 @@ getRemoteVersion(){
|
|
|
|
|
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() {
|
|
|
|
|
echo "::: Pi-hole version is $(getLocalVersion "${PHGITDIR}") (Latest version is $(getRemoteVersion pi-hole))"
|
|
|
|
|
if [ -d "${WEBGITDIR}" ]; then
|
|
|
|
|
echo "::: Web-Admin version is $(getLocalVersion "${WEBGITDIR}") (Latest version is $(getRemoteVersion AdminLTE))"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
versionOutput() {
|
|
|
|
|
[[ "$1" == "pi-hole" ]] && GITDIR=$COREGITDIR
|
|
|
|
|
[[ "$1" == "AdminLTE" ]] && GITDIR=$WEBGITDIR
|
|
|
|
|
[[ "$1" == "FTL" ]] && GITDIR="FTL"
|
|
|
|
|
|
|
|
|
|
[[ "$2" == "-c" ]] || [[ "$2" == "--current" ]] || [[ -z "$2" ]] && current=$(getLocalVersion $GITDIR)
|
|
|
|
|
[[ "$2" == "-l" ]] || [[ "$2" == "--latest" ]] || [[ -z "$2" ]] && latest=$(getRemoteVersion "$1")
|
|
|
|
|
if [[ "$2" == "-h" ]] || [[ "$2" == "--hash" ]]; then
|
|
|
|
|
[[ "$3" == "-c" ]] || [[ "$3" == "--current" ]] || [[ -z "$3" ]] && curHash=$(getLocalHash "$GITDIR")
|
|
|
|
|
[[ "$3" == "-l" ]] || [[ "$3" == "--latest" ]] || [[ -z "$3" ]] && latHash=$(getRemoteHash "$1" "$(cd "$GITDIR" 2> /dev/null && git rev-parse --abbrev-ref HEAD)")
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
webOutput() {
|
|
|
|
|
if [ -d "${WEBGITDIR}" ]; then
|
|
|
|
|
case "${1}" in
|
|
|
|
|
"-l" | "--latest" ) echo $(getRemoteVersion AdminLTE);;
|
|
|
|
|
"-c" | "--current" ) echo $(getLocalVersion "${WEBGITDIR}");;
|
|
|
|
|
"-h" | "--hash" ) echo $(getLocalHash "${WEBGITDIR}");;
|
|
|
|
|
* ) echo "::: Invalid Option!"; exit 1;
|
|
|
|
|
esac
|
|
|
|
|
if [[ -n "$current" ]] && [[ -n "$latest" ]]; then
|
|
|
|
|
output="${1^} version is $current (Latest: $latest)"
|
|
|
|
|
elif [[ -n "$current" ]] && [[ -z "$latest" ]]; then
|
|
|
|
|
output="Current ${1^} version is $current"
|
|
|
|
|
elif [[ -z "$current" ]] && [[ -n "$latest" ]]; then
|
|
|
|
|
output="Latest ${1^} version is $latest"
|
|
|
|
|
elif [[ "$curHash" == "N/A" ]] || [[ "$latHash" == "N/A" ]]; then
|
|
|
|
|
output="${1^} hash is not applicable"
|
|
|
|
|
elif [[ -n "$curHash" ]] && [[ -n "$latHash" ]]; then
|
|
|
|
|
output="${1^} hash is $curHash (Latest: $latHash)"
|
|
|
|
|
elif [[ -n "$curHash" ]] && [[ -z "$latHash" ]]; then
|
|
|
|
|
output="Current ${1^} hash is $curHash"
|
|
|
|
|
elif [[ -z "$curHash" ]] && [[ -n "$latHash" ]]; then
|
|
|
|
|
output="Latest ${1^} hash is $latHash"
|
|
|
|
|
else
|
|
|
|
|
echo "::: Web interface not installed!"; exit 1;
|
|
|
|
|
errorOutput
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
[[ -n "$output" ]] && echo " $output"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
coreOutput() {
|
|
|
|
|
case "${1}" in
|
|
|
|
|
"-l" | "--latest" ) echo $(getRemoteVersion pi-hole);;
|
|
|
|
|
"-c" | "--current" ) echo $(getLocalVersion "${PHGITDIR}");;
|
|
|
|
|
"-h" | "--hash" ) echo $(getLocalHash "${PHGITDIR}");;
|
|
|
|
|
* ) echo "::: Invalid Option!"; exit 1;
|
|
|
|
|
esac
|
|
|
|
|
errorOutput() {
|
|
|
|
|
echo " Invalid Option! Try 'pihole -v --help' for more information."
|
|
|
|
|
exit 1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
defaultOutput() {
|
|
|
|
|
versionOutput "pi-hole" "$@"
|
|
|
|
|
versionOutput "AdminLTE" "$@"
|
|
|
|
|
versionOutput "FTL" "$@"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
helpFunc() {
|
|
|
|
|
cat << EOM
|
|
|
|
|
:::
|
|
|
|
|
::: Show Pi-hole/Web Admin versions
|
|
|
|
|
:::
|
|
|
|
|
::: Usage: pihole -v [ -a | -p ] [ -l | -c ]
|
|
|
|
|
:::
|
|
|
|
|
::: Options:
|
|
|
|
|
::: -a, --admin Show both current and latest versions of web admin
|
|
|
|
|
::: -p, --pihole Show both current and latest versions of Pi-hole core files
|
|
|
|
|
::: -l, --latest (Only after -a | -p) Return only latest version
|
|
|
|
|
::: -c, --current (Only after -a | -p) Return only current version
|
|
|
|
|
::: -h, --help Show this help dialog
|
|
|
|
|
:::
|
|
|
|
|
EOM
|
|
|
|
|
echo "Usage: pihole -v [REPO | OPTION] [OPTION]
|
|
|
|
|
Show Pi-hole, Web Admin & FTL versions
|
|
|
|
|
|
|
|
|
|
Repositories:
|
|
|
|
|
-p, --pihole Only retrieve info regarding Pi-hole repository
|
|
|
|
|
-a, --admin Only retrieve info regarding AdminLTE repository
|
|
|
|
|
-f, --ftl Only retrieve info regarding FTL repository
|
|
|
|
|
|
|
|
|
|
Options:
|
|
|
|
|
-c, --current Return the current version
|
|
|
|
|
-l, --latest Return the latest version
|
|
|
|
|
-h, --hash Return the Github hash from your local repositories
|
|
|
|
|
--help Show this help dialog
|
|
|
|
|
"
|
|
|
|
|
exit 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if [[ $# = 0 ]]; then
|
|
|
|
|
normalOutput
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
case "${1}" in
|
|
|
|
|
"-a" | "--admin" ) shift; webOutput "$@";;
|
|
|
|
|
"-p" | "--pihole" ) shift; coreOutput "$@" ;;
|
|
|
|
|
"-h" | "--help" ) helpFunc;;
|
|
|
|
|
"-p" | "--pihole" ) shift; versionOutput "pi-hole" "$@";;
|
|
|
|
|
"-a" | "--admin" ) shift; versionOutput "AdminLTE" "$@";;
|
|
|
|
|
"-f" | "--ftl" ) shift; versionOutput "FTL" "$@";;
|
|
|
|
|
"--help" ) helpFunc;;
|
|
|
|
|
* ) defaultOutput "$@";;
|
|
|
|
|
esac
|
|
|
|
|
|
WaLLy3K
7 years ago
committed by