|
|
|
@ -41,54 +41,78 @@ function get_local_version() {
|
|
|
|
|
# shellcheck disable=SC1091
|
|
|
|
|
. /etc/pihole/setupVars.conf
|
|
|
|
|
|
|
|
|
|
utilsfile="/opt/pihole/utils.sh"
|
|
|
|
|
source "${utilsfile}"
|
|
|
|
|
|
|
|
|
|
# Remove the below three legacy files if they exist
|
|
|
|
|
GITHUB_VERSION_FILE="/etc/pihole/GitHubVersions"
|
|
|
|
|
LOCAL_BRANCH_FILE="/etc/pihole/localbranches"
|
|
|
|
|
LOCAL_VERSION_FILE="/etc/pihole/localversions"
|
|
|
|
|
|
|
|
|
|
if [ -f "${GITHUB_VERSION_FILE}" ]; then
|
|
|
|
|
rm "${GITHUB_VERSION_FILE}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ -f "${LOCAL_BRANCH_FILE}" ]; then
|
|
|
|
|
rm "${LOCAL_BRANCH_FILE}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ -f "${LOCAL_VERSION_FILE}" ]; then
|
|
|
|
|
rm "${LOCAL_VERSION_FILE}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Create new versions file if it does not exist
|
|
|
|
|
VERSION_FILE="/etc/pihole/versions"
|
|
|
|
|
|
|
|
|
|
if [ ! -f "${VERSION_FILE}" ]; then
|
|
|
|
|
touch "${VERSION_FILE}"
|
|
|
|
|
chmod 644 "${VERSION_FILE}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [[ "$2" == "remote" ]]; then
|
|
|
|
|
|
|
|
|
|
if [[ "$3" == "reboot" ]]; then
|
|
|
|
|
sleep 30
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
GITHUB_VERSION_FILE="/etc/pihole/GitHubVersions"
|
|
|
|
|
|
|
|
|
|
GITHUB_CORE_VERSION="$(json_extract tag_name "$(curl -s 'https://api.github.com/repos/pi-hole/pi-hole/releases/latest' 2> /dev/null)")"
|
|
|
|
|
echo -n "${GITHUB_CORE_VERSION}" > "${GITHUB_VERSION_FILE}"
|
|
|
|
|
chmod 644 "${GITHUB_VERSION_FILE}"
|
|
|
|
|
addOrEditKeyValPair "${VERSION_FILE}" "GITHUB_CORE_VERSION" "${GITHUB_CORE_VERSION}"
|
|
|
|
|
|
|
|
|
|
if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
|
|
|
|
|
GITHUB_WEB_VERSION="$(json_extract tag_name "$(curl -s 'https://api.github.com/repos/pi-hole/AdminLTE/releases/latest' 2> /dev/null)")"
|
|
|
|
|
echo -n " ${GITHUB_WEB_VERSION}" >> "${GITHUB_VERSION_FILE}"
|
|
|
|
|
addOrEditKeyValPair "${VERSION_FILE}" "GITHUB_WEB_VERSION" "${GITHUB_WEB_VERSION}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
GITHUB_FTL_VERSION="$(json_extract tag_name "$(curl -s 'https://api.github.com/repos/pi-hole/FTL/releases/latest' 2> /dev/null)")"
|
|
|
|
|
echo -n " ${GITHUB_FTL_VERSION}" >> "${GITHUB_VERSION_FILE}"
|
|
|
|
|
addOrEditKeyValPair "${VERSION_FILE}" "GITHUB_FTL_VERSION" "${GITHUB_FTL_VERSION}"
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
if [[ "${PIHOLE_DOCKER_TAG}" ]]; then
|
|
|
|
|
GITHUB_DOCKER_VERSION="$(json_extract tag_name "$(curl -s 'https://api.github.com/repos/pi-hole/docker-pi-hole/releases/latest' 2> /dev/null)")"
|
|
|
|
|
addOrEditKeyValPair "${VERSION_FILE}" "GITHUB_DOCKER_VERSION" "${GITHUB_DOCKER_VERSION}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
LOCAL_BRANCH_FILE="/etc/pihole/localbranches"
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
CORE_BRANCH="$(get_local_branch /etc/.pihole)"
|
|
|
|
|
echo -n "${CORE_BRANCH}" > "${LOCAL_BRANCH_FILE}"
|
|
|
|
|
chmod 644 "${LOCAL_BRANCH_FILE}"
|
|
|
|
|
addOrEditKeyValPair "${VERSION_FILE}" "CORE_BRANCH" "${CORE_BRANCH}"
|
|
|
|
|
|
|
|
|
|
if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
|
|
|
|
|
WEB_BRANCH="$(get_local_branch /var/www/html/admin)"
|
|
|
|
|
echo -n " ${WEB_BRANCH}" >> "${LOCAL_BRANCH_FILE}"
|
|
|
|
|
addOrEditKeyValPair "${VERSION_FILE}" "WEB_BRANCH" "${WEB_BRANCH}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
FTL_BRANCH="$(pihole-FTL branch)"
|
|
|
|
|
echo -n " ${FTL_BRANCH}" >> "${LOCAL_BRANCH_FILE}"
|
|
|
|
|
|
|
|
|
|
LOCAL_VERSION_FILE="/etc/pihole/localversions"
|
|
|
|
|
addOrEditKeyValPair "${VERSION_FILE}" "FTL_BRANCH" "${FTL_BRANCH}"
|
|
|
|
|
|
|
|
|
|
CORE_VERSION="$(get_local_version /etc/.pihole)"
|
|
|
|
|
echo -n "${CORE_VERSION}" > "${LOCAL_VERSION_FILE}"
|
|
|
|
|
chmod 644 "${LOCAL_VERSION_FILE}"
|
|
|
|
|
addOrEditKeyValPair "${VERSION_FILE}" "CORE_VERSION" "${CORE_VERSION}"
|
|
|
|
|
|
|
|
|
|
if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then
|
|
|
|
|
WEB_VERSION="$(get_local_version /var/www/html/admin)"
|
|
|
|
|
echo -n " ${WEB_VERSION}" >> "${LOCAL_VERSION_FILE}"
|
|
|
|
|
addOrEditKeyValPair "${VERSION_FILE}" "WEB_VERSION" "${WEB_VERSION}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
FTL_VERSION="$(pihole-FTL version)"
|
|
|
|
|
echo -n " ${FTL_VERSION}" >> "${LOCAL_VERSION_FILE}"
|
|
|
|
|
addOrEditKeyValPair "${VERSION_FILE}" "FTL_VERSION" "${FTL_VERSION}"
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
|