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

sync: master to development (#5017)

Browse source
This commit is contained in:
Adam Warner 2022-11-14 22:46:26 +00:00 committed by GitHub
commit b13a75a223
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
advanced/Scripts/piholeDebug.sh
View file

@ -314,9 +314,9 @@ check_ftl_version() {
local FTL_VERSION FTL_COMMIT FTL_BRANCH local FTL_VERSION FTL_COMMIT FTL_BRANCH
echo_current_diagnostic "FTL version" echo_current_diagnostic "FTL version"
# Use the built in command to check FTL's version # Use the built in command to check FTL's version
FTL_VERSION=$(pihole-FTL -vv | grep -m 1 Version | awk '{printf $2}') FTL_VERSION=$(pihole-FTL version)
FTL_BRANCH=$(pihole-FTL -vv | grep -m 1 Branch | awk '{printf $2}') FTL_BRANCH=$(pihole-FTL branch)
FTL_COMMIT=$(pihole-FTL -vv | grep -m 1 Commit | awk '{printf $2}') FTL_COMMIT=$(pihole-FTL --hash)
log_write "${TICK} Version: ${FTL_VERSION}" log_write "${TICK} Version: ${FTL_VERSION}"

6
advanced/Scripts/updatecheck.sh
View file

@ -17,7 +17,7 @@ function get_local_branch() {
function get_local_version() { function get_local_version() {
# Return active version # Return active version
cd "${1}" 2> /dev/null || return 1 cd "${1}" 2> /dev/null || return 1
git describe --long --dirty --tags 2> /dev/null || return 1 git describe --tags --always 2> /dev/null || return 1
} }
function get_local_hash() { function get_local_hash() {
@ -31,7 +31,7 @@ function get_remote_version() {
function get_remote_hash(){ function get_remote_hash(){
git ls-remote "https://github.com/pi-hole/${1}" --tags "${2}" | awk '{print substr($0, 0,9);}' || return 1 git ls-remote "https://github.com/pi-hole/${1}" --tags "${2}" | awk '{print substr($0, 0,8);}' || return 1
} }
# Source the setupvars config file # Source the setupvars config file
@ -113,7 +113,7 @@ addOrEditKeyValPair "${VERSION_FILE}" "FTL_VERSION" "${FTL_VERSION}"
FTL_BRANCH="$(pihole-FTL branch)" FTL_BRANCH="$(pihole-FTL branch)"
addOrEditKeyValPair "${VERSION_FILE}" "FTL_BRANCH" "${FTL_BRANCH}" addOrEditKeyValPair "${VERSION_FILE}" "FTL_BRANCH" "${FTL_BRANCH}"
FTL_HASH="$(pihole-FTL -v | cut -d "-" -f2)" FTL_HASH="$(pihole-FTL --hash)"
addOrEditKeyValPair "${VERSION_FILE}" "FTL_HASH" "${FTL_HASH}" addOrEditKeyValPair "${VERSION_FILE}" "FTL_HASH" "${FTL_HASH}"
GITHUB_FTL_VERSION="$(get_remote_version FTL)" GITHUB_FTL_VERSION="$(get_remote_version FTL)"

19
advanced/Scripts/version.sh
View file

@ -77,18 +77,27 @@ versionOutput() {
[ "$3" = "-c" ] || [ "$3" = "--current" ] || [ -z "$3" ] && curHash=$(getLocalHash "${1}") && branch=$(getLocalBranch "${1}") [ "$3" = "-c" ] || [ "$3" = "--current" ] || [ -z "$3" ] && curHash=$(getLocalHash "${1}") && branch=$(getLocalBranch "${1}")
[ "$3" = "-l" ] || [ "$3" = "--latest" ] || [ -z "$3" ] && latHash=$(getRemoteHash "${1}") && branch=$(getLocalBranch "${1}") [ "$3" = "-l" ] || [ "$3" = "--latest" ] || [ -z "$3" ] && latHash=$(getRemoteHash "${1}") && branch=$(getLocalBranch "${1}")
fi fi
# We do not want to show the branch name when we are on master,
# blank out the variable in this case
if [ "$branch" = "master" ]; then
branch=""
else
branch="$branch "
fi
if [ -n "$current" ] && [ -n "$latest" ]; then if [ -n "$current" ] && [ -n "$latest" ]; then
output="${1} version is $branch $current (Latest: $latest)" output="${1} version is $branch$current (Latest: $latest)"
elif [ -n "$current" ] && [ -z "$latest" ]; then elif [ -n "$current" ] && [ -z "$latest" ]; then
output="Current ${1} version is $branch $current" output="Current ${1} version is $branch$current"
elif [ -z "$current" ] && [ -n "$latest" ]; then elif [ -z "$current" ] && [ -n "$latest" ]; then
output="Latest ${1} version is $latest" output="Latest ${1} version is $latest"
elif [ -n "$curHash" ] && [ -n "$latHash" ]; then elif [ -n "$curHash" ] && [ -n "$latHash" ]; then
output="Local ${1} hash of branch $branch is $curHash (Remote: $latHash)" output="Local ${1} hash is $curHash (Remote: $latHash)"
elif [ -n "$curHash" ] && [ -z "$latHash" ]; then elif [ -n "$curHash" ] && [ -z "$latHash" ]; then
output="Current local ${1} hash of branch $branch is $curHash" output="Current local ${1} hash is $curHash"
elif [ -z "$curHash" ] && [ -n "$latHash" ]; then elif [ -z "$curHash" ] && [ -n "$latHash" ]; then
output="Latest remote ${1} hash of branch $branch is $latHash" output="Latest remote ${1} hash is $latHash"
elif [ -z "$curHash" ] && [ -z "$latHash" ]; then elif [ -z "$curHash" ] && [ -z "$latHash" ]; then
output="Hashes for ${1} not available" output="Hashes for ${1} not available"
else else