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 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use versions file instead of github api to get latest version

Browse source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König 2022-10-14 10:29:14 +02:00
parent 5c61f6cb65
commit d85982dc51
No known key found for this signature in database
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
advanced/Scripts/piholeDebug.sh
View file

@ -238,14 +238,19 @@ compare_local_version_to_git_version() {
local git_dir="${1}" local git_dir="${1}"
# The named component of the project (Core or Web) # The named component of the project (Core or Web)
local pihole_component="${2}" local pihole_component="${2}"
# If we are checking the Core versions, # If we are checking the Core versions,
if [[ "${pihole_component}" == "Core" ]]; then if [[ "${pihole_component}" == "Core" ]]; then
# set the github repo name local remote_version
local repo_name="pi-hole" # remote version is taken from /etc/pihole/versions (sourced above)
remote_version="${GITHUB_CORE_VERSION}"
elif [[ "${pihole_component}" == "Web" ]]; then elif [[ "${pihole_component}" == "Web" ]]; then
# set the github repo name local remote_version
#shellcheck disable=2034 # remote version is taken from /etc/pihole/versions (sourced above)
local repo_name="adminlte" remote_version="${GITHUB_WEB_VERSION}"
fi
if [ -z "${remote_version}" ]; then
remote_version="N/A"
fi fi
# Display what we are checking # Display what we are checking
echo_current_diagnostic "${pihole_component} version" echo_current_diagnostic "${pihole_component} version"
@ -270,8 +275,6 @@ compare_local_version_to_git_version() {
# Status of the repo # Status of the repo
local local_status local local_status
local_status=$(git status -s) local_status=$(git status -s)
local remote_version
remote_version=$(curl -s "https://api.github.com/repos/pi-hole/${repo_name}/releases/latest" 2> /dev/null | jq --raw-output .tag_name)
# echo this information out to the user in a nice format # echo this information out to the user in a nice format
# If the current version matches the latest tag, the user is up-to-date # If the current version matches the latest tag, the user is up-to-date
if [[ "${local_version}" == "${remote_version}" ]]; then if [[ "${local_version}" == "${remote_version}" ]]; then
@ -338,7 +341,11 @@ check_ftl_version() {
FTL_BRANCH=$(pihole-FTL -vv | grep -m 1 Branch | awk '{printf $2}') FTL_BRANCH=$(pihole-FTL -vv | grep -m 1 Branch | awk '{printf $2}')
FTL_COMMIT=$(pihole-FTL -vv | grep -m 1 Commit | awk '{printf $2}') FTL_COMMIT=$(pihole-FTL -vv | grep -m 1 Commit | awk '{printf $2}')
remote_version=$(curl -s 'https://api.github.com/repos/pi-hole/ftl/releases/latest' 2> /dev/null | jq --raw-output .tag_name) # remote version is taken from /etc/pihole/versions (sourced above)
remote_version="${GITHUB_FTL_VERSION}"
if [ -z "${remote_version}" ]; then
remote_version="N/A"
fi
# Compare the current FTL version to the remote version # Compare the current FTL version to the remote version
if [[ "${FTL_VERSION}" == "${remote_version}" ]]; then if [[ "${FTL_VERSION}" == "${remote_version}" ]]; then