|
|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
#!/usr/bin/env bash
|
|
|
|
|
#!/usr/bin/env sh
|
|
|
|
|
# Pi-hole: A black hole for Internet advertisements
|
|
|
|
|
# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
|
|
|
|
|
# Network-wide ad blocking via your own hardware.
|
|
|
|
|
@ -8,179 +8,95 @@
|
|
|
|
|
# This file is copyright under the latest version of the EUPL.
|
|
|
|
|
# Please see LICENSE file for your rights under this license.
|
|
|
|
|
|
|
|
|
|
# Variables
|
|
|
|
|
DEFAULT="-1"
|
|
|
|
|
COREGITDIR="/etc/.pihole/"
|
|
|
|
|
WEBGITDIR="/var/www/html/admin/"
|
|
|
|
|
|
|
|
|
|
# Source the setupvars config file
|
|
|
|
|
# shellcheck disable=SC1091
|
|
|
|
|
source /etc/pihole/setupVars.conf
|
|
|
|
|
. /etc/pihole/setupVars.conf
|
|
|
|
|
|
|
|
|
|
getLocalVersion() {
|
|
|
|
|
# FTL requires a different method
|
|
|
|
|
if [[ "$1" == "FTL" ]]; then
|
|
|
|
|
pihole-FTL version
|
|
|
|
|
return 0
|
|
|
|
|
fi
|
|
|
|
|
# Source the versions file poupulated by updatechecker.sh
|
|
|
|
|
cachedVersions="/etc/pihole/versions"
|
|
|
|
|
|
|
|
|
|
# Get the tagged version of the local repository
|
|
|
|
|
local directory="${1}"
|
|
|
|
|
local version
|
|
|
|
|
if [ -f ${cachedVersions} ]; then
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
. "$cachedVersions"
|
|
|
|
|
else
|
|
|
|
|
echo "Could not find /etc/pihole/versions. Running update now."
|
|
|
|
|
pihole updatechecker
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
. "$cachedVersions"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
echo "ERROR"
|
|
|
|
|
return 1
|
|
|
|
|
else
|
|
|
|
|
echo "Untagged"
|
|
|
|
|
fi
|
|
|
|
|
return 0
|
|
|
|
|
getLocalVersion() {
|
|
|
|
|
case ${1} in
|
|
|
|
|
"Pi-hole" ) echo "${CORE_VERSION:=N/A}";;
|
|
|
|
|
"AdminLTE" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${WEB_VERSION:=N/A}";;
|
|
|
|
|
"FTL" ) echo "${FTL_VERSION:=N/A}";;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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}" 2> /dev/null || { 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
|
|
|
|
|
case ${1} in
|
|
|
|
|
"Pi-hole" ) echo "${CORE_HASH:=N/A}";;
|
|
|
|
|
"AdminLTE" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${WEB_HASH:=N/A}";;
|
|
|
|
|
"FTL" ) echo "${FTL_HASH:=N/A}";;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
case ${1} in
|
|
|
|
|
"Pi-hole" ) echo "${GITHUB_CORE_HASH:=N/A}";;
|
|
|
|
|
"AdminLTE" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${GITHUB_WEB_HASH:=N/A}";;
|
|
|
|
|
"FTL" ) echo "${GITHUB_FTL_HASH:=N/A}";;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
getRemoteVersion(){
|
|
|
|
|
# Get the version from the remote origin
|
|
|
|
|
local daemon="${1}"
|
|
|
|
|
local version
|
|
|
|
|
local cachedVersions
|
|
|
|
|
cachedVersions="/etc/pihole/versions"
|
|
|
|
|
|
|
|
|
|
#If the above file exists, then we can read from that. Prevents overuse of GitHub API
|
|
|
|
|
if [[ -f "$cachedVersions" ]]; then
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC1090
|
|
|
|
|
. "$cachedVersions"
|
|
|
|
|
|
|
|
|
|
case $daemon in
|
|
|
|
|
"pi-hole" ) echo "${GITHUB_CORE_VERSION}";;
|
|
|
|
|
"AdminLTE" ) [[ "${INSTALL_WEB_INTERFACE}" == true ]] && echo "${GITHUB_WEB_VERSION}";;
|
|
|
|
|
"FTL" ) echo "${GITHUB_FTL_VERSION}";;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
return 0
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
case ${1} in
|
|
|
|
|
"Pi-hole" ) echo "${GITHUB_CORE_VERSION:=N/A}";;
|
|
|
|
|
"AdminLTE" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${GITHUB_WEB_VERSION:=N/A}";;
|
|
|
|
|
"FTL" ) echo "${GITHUB_FTL_VERSION:=N/A}";;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
getLocalBranch(){
|
|
|
|
|
# Get the checked out branch of the local directory
|
|
|
|
|
local directory="${1}"
|
|
|
|
|
local branch
|
|
|
|
|
|
|
|
|
|
# Local FTL btranch is stored in /etc/pihole/ftlbranch
|
|
|
|
|
if [[ "$1" == "FTL" ]]; then
|
|
|
|
|
branch="$(pihole-FTL branch)"
|
|
|
|
|
else
|
|
|
|
|
cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; }
|
|
|
|
|
branch=$(git rev-parse --abbrev-ref HEAD || echo "$DEFAULT")
|
|
|
|
|
fi
|
|
|
|
|
if [[ ! "${branch}" =~ ^v ]]; then
|
|
|
|
|
if [[ "${branch}" == "master" ]]; then
|
|
|
|
|
echo ""
|
|
|
|
|
elif [[ "${branch}" == "HEAD" ]]; then
|
|
|
|
|
echo "in detached HEAD state at "
|
|
|
|
|
else
|
|
|
|
|
echo "${branch} "
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
# Branch started in "v"
|
|
|
|
|
echo "release "
|
|
|
|
|
fi
|
|
|
|
|
return 0
|
|
|
|
|
case ${1} in
|
|
|
|
|
"Pi-hole" ) echo "${CORE_BRANCH:=N/A}";;
|
|
|
|
|
"AdminLTE" ) [ "${INSTALL_WEB_INTERFACE}" = true ] && echo "${WEB_BRANCH:=N/A}";;
|
|
|
|
|
"FTL" ) echo "${FTL_BRANCH:=N/A}";;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
versionOutput() {
|
|
|
|
|
if [[ "$1" == "AdminLTE" && "${INSTALL_WEB_INTERFACE}" != true ]]; then
|
|
|
|
|
if [ "$1" = "AdminLTE" ] && [ "${INSTALL_WEB_INTERFACE}" != true ]; then
|
|
|
|
|
echo " WebAdmin not installed"
|
|
|
|
|
return 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
[[ "$1" == "pi-hole" ]] && GITDIR=$COREGITDIR
|
|
|
|
|
[[ "$1" == "AdminLTE" ]] && GITDIR=$WEBGITDIR
|
|
|
|
|
[[ "$1" == "FTL" ]] && GITDIR="FTL"
|
|
|
|
|
|
|
|
|
|
[[ "$2" == "-c" ]] || [[ "$2" == "--current" ]] || [[ -z "$2" ]] && current=$(getLocalVersion $GITDIR) && branch=$(getLocalBranch $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") && branch=$(getLocalBranch $GITDIR)
|
|
|
|
|
[[ "$3" == "-l" ]] || [[ "$3" == "--latest" ]] || [[ -z "$3" ]] && latHash=$(getRemoteHash "$1" "$(cd "$GITDIR" 2> /dev/null && git rev-parse --abbrev-ref HEAD)")
|
|
|
|
|
[ "$2" = "-c" ] || [ "$2" = "--current" ] || [ -z "$2" ] && current=$(getLocalVersion "${1}") && branch=$(getLocalBranch "${1}")
|
|
|
|
|
[ "$2" = "-l" ] || [ "$2" = "--latest" ] || [ -z "$2" ] && latest=$(getRemoteVersion "${1}")
|
|
|
|
|
if [ "$2" = "--hash" ]; then
|
|
|
|
|
[ "$3" = "-c" ] || [ "$3" = "--current" ] || [ -z "$3" ] && curHash=$(getLocalHash "${1}") && branch=$(getLocalBranch "${1}")
|
|
|
|
|
[ "$3" = "-l" ] || [ "$3" = "--latest" ] || [ -z "$3" ] && latHash=$(getRemoteHash "${1}") && branch=$(getLocalBranch "${1}")
|
|
|
|
|
fi
|
|
|
|
|
if [[ -n "$current" ]] && [[ -n "$latest" ]]; then
|
|
|
|
|
output="${1^} version is $branch$current (Latest: $latest)"
|
|
|
|
|
elif [[ -n "$current" ]] && [[ -z "$latest" ]]; then
|
|
|
|
|
output="Current ${1^} version is $branch$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"
|
|
|
|
|
if [ -n "$current" ] && [ -n "$latest" ]; then
|
|
|
|
|
output="${1} version is $branch $current (Latest: $latest)"
|
|
|
|
|
elif [ -n "$current" ] && [ -z "$latest" ]; then
|
|
|
|
|
output="Current ${1} version is $branch $current"
|
|
|
|
|
elif [ -z "$current" ] && [ -n "$latest" ]; then
|
|
|
|
|
output="Latest ${1} version is $latest"
|
|
|
|
|
elif [ -n "$curHash" ] && [ -n "$latHash" ]; then
|
|
|
|
|
output="Local ${1} hash of branch $branch is $curHash (Remote: $latHash)"
|
|
|
|
|
elif [ -n "$curHash" ] && [ -z "$latHash" ]; then
|
|
|
|
|
output="Current local ${1} hash of branch $branch is $curHash"
|
|
|
|
|
elif [ -z "$curHash" ] && [ -n "$latHash" ]; then
|
|
|
|
|
output="Latest remote ${1} hash of branch $branch is $latHash"
|
|
|
|
|
elif [ -z "$curHash" ] && [ -z "$latHash" ]; then
|
|
|
|
|
output="Hashes for ${1} not available"
|
|
|
|
|
else
|
|
|
|
|
errorOutput
|
|
|
|
|
return 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
[[ -n "$output" ]] && echo " $output"
|
|
|
|
|
[ -n "$output" ] && echo " $output"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
errorOutput() {
|
|
|
|
|
@ -189,9 +105,9 @@ errorOutput() {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
defaultOutput() {
|
|
|
|
|
versionOutput "pi-hole" "$@"
|
|
|
|
|
versionOutput "Pi-hole" "$@"
|
|
|
|
|
|
|
|
|
|
if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
|
|
|
|
|
if [ "${INSTALL_WEB_INTERFACE}" = true ]; then
|
|
|
|
|
versionOutput "AdminLTE" "$@"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@ -217,7 +133,7 @@ Options:
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case "${1}" in
|
|
|
|
|
"-p" | "--pihole" ) shift; versionOutput "pi-hole" "$@";;
|
|
|
|
|
"-p" | "--pihole" ) shift; versionOutput "Pi-hole" "$@";;
|
|
|
|
|
"-a" | "--admin" ) shift; versionOutput "AdminLTE" "$@";;
|
|
|
|
|
"-f" | "--ftl" ) shift; versionOutput "FTL" "$@";;
|
|
|
|
|
"-h" | "--help" ) helpFunc;;
|
|
|
|
|
|
Adam Warner
2 years ago
committed by