mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-11-15 18:53:56 +00:00
12817c09bb
Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated... Signed-off-by: Adam Warner <me@adamwarner.co.uk> no need for global variable Signed-off-by: Adam Warner <me@adamwarner.co.uk> Use a file in the temporary FTL download directory Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Local binary variable named to l_binary. Disambiguate from global binary. Allow 'binary' to be shadowed for testing. Use ./ftlbinary in all operations. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Revert shadow ability on binary variable. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Remove unused tests, binary variable can not be overridden. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> This should work here, too Signed-off-by: Adam Warner <me@adamwarner.co.uk> binary name is passed through from pihole checkout Signed-off-by: Adam Warner <me@adamwarner.co.uk> Add comments Signed-off-by: Adam Warner <me@adamwarner.co.uk> OK, let's try it this way again Signed-off-by: Adam Warner <me@adamwarner.co.uk> we might be getting somewhere.. squash after this I think! Signed-off-by: Adam Warner <me@adamwarner.co.uk> This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits Signed-off-by: Adam Warner <me@adamwarner.co.uk> fix the rest of the tests Signed-off-by: Adam Warner <me@adamwarner.co.uk> Remove trailing whitespace in the files we've touched here Signed-off-by: Adam Warner <me@adamwarner.co.uk>
201 lines
8 KiB
Bash
201 lines
8 KiB
Bash
#!/usr/bin/env bash
|
|
# 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.
|
|
#
|
|
# Switch Pi-hole subsystems to a different Github branch.
|
|
#
|
|
# This file is copyright under the latest version of the EUPL.
|
|
# Please see LICENSE file for your rights under this license.
|
|
|
|
readonly PI_HOLE_FILES_DIR="/etc/.pihole"
|
|
PH_TEST="true"
|
|
source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
|
|
|
|
# webInterfaceGitUrl set in basic-install.sh
|
|
# webInterfaceDir set in basic-install.sh
|
|
# piholeGitURL set in basic-install.sh
|
|
# is_repo() sourced from basic-install.sh
|
|
# setupVars set in basic-install.sh
|
|
# check_download_exists sourced from basic-install.sh
|
|
# fully_fetch_repo sourced from basic-install.sh
|
|
# get_available_branches sourced from basic-install.sh
|
|
# fetch_checkout_pull_branch sourced from basic-install.sh
|
|
# checkout_pull_branch sourced from basic-install.sh
|
|
|
|
source "${setupVars}"
|
|
|
|
warning1() {
|
|
echo " Please note that changing branches severely alters your Pi-hole subsystems"
|
|
echo " Features that work on the master branch, may not on a development branch"
|
|
echo -e " ${COL_LIGHT_RED}This feature is NOT supported unless a Pi-hole developer explicitly asks!${COL_NC}"
|
|
read -r -p " Have you read and understood this? [y/N] " response
|
|
case "${response}" in
|
|
[yY][eE][sS]|[yY])
|
|
echo ""
|
|
return 0
|
|
;;
|
|
*)
|
|
echo -e "\\n ${INFO} Branch change has been cancelled"
|
|
return 1
|
|
;;
|
|
esac
|
|
}
|
|
|
|
checkout() {
|
|
local corebranches
|
|
local webbranches
|
|
|
|
# Check if FTL is installed - do this early on as FTL is a hard dependency for Pi-hole
|
|
local funcOutput
|
|
funcOutput=$(get_binary_name) #Store output of get_binary_name here
|
|
local binary
|
|
binary="pihole-FTL${funcOutput##*pihole-FTL}" #binary name will be the last line of the output of get_binary_name (it always begins with pihole-FTL)
|
|
|
|
# Avoid globbing
|
|
set -f
|
|
|
|
# This is unlikely
|
|
if ! is_repo "${PI_HOLE_FILES_DIR}" ; then
|
|
echo -e " ${COL_LIGHT_RED}Error: Core Pi-hole repo is missing from system!"
|
|
echo -e " Please re-run install script from https://github.com/pi-hole/pi-hole${COL_NC}"
|
|
exit 1;
|
|
fi
|
|
if [[ "${INSTALL_WEB_INTERFACE}" == "true" ]]; then
|
|
if ! is_repo "${webInterfaceDir}" ; then
|
|
echo -e " ${COL_LIGHT_RED}Error: Web Admin repo is missing from system!"
|
|
echo -e " Please re-run install script from https://github.com/pi-hole/pi-hole${COL_NC}"
|
|
exit 1;
|
|
fi
|
|
fi
|
|
|
|
if [[ -z "${1}" ]]; then
|
|
echo -e " ${COL_LIGHT_RED}Invalid option${COL_NC}"
|
|
echo -e " Try 'pihole checkout --help' for more information."
|
|
exit 1
|
|
fi
|
|
|
|
if ! warning1 ; then
|
|
exit 1
|
|
fi
|
|
|
|
if [[ "${1}" == "dev" ]] ; then
|
|
# Shortcut to check out development branches
|
|
echo -e " ${INFO} Shortcut \"dev\" detected - checking out development / devel branches..."
|
|
echo ""
|
|
echo -e " ${INFO} Pi-hole Core"
|
|
fetch_checkout_pull_branch "${PI_HOLE_FILES_DIR}" "development" || { echo " ${CROSS} Unable to pull Core developement branch"; exit 1; }
|
|
if [[ "${INSTALL_WEB_INTERFACE}" == "true" ]]; then
|
|
echo ""
|
|
echo -e " ${INFO} Web interface"
|
|
fetch_checkout_pull_branch "${webInterfaceDir}" "devel" || { echo " ${CROSS} Unable to pull Web development branch"; exit 1; }
|
|
fi
|
|
#echo -e " ${TICK} Pi-hole Core"
|
|
|
|
local path
|
|
path="development/${binary}"
|
|
echo "development" > /etc/pihole/ftlbranch
|
|
chmod 644 /etc/pihole/ftlbranch
|
|
elif [[ "${1}" == "master" ]] ; then
|
|
# Shortcut to check out master branches
|
|
echo -e " ${INFO} Shortcut \"master\" detected - checking out master branches..."
|
|
echo -e " ${INFO} Pi-hole core"
|
|
fetch_checkout_pull_branch "${PI_HOLE_FILES_DIR}" "master" || { echo " ${CROSS} Unable to pull Core master branch"; exit 1; }
|
|
if [[ ${INSTALL_WEB_INTERFACE} == "true" ]]; then
|
|
echo -e " ${INFO} Web interface"
|
|
fetch_checkout_pull_branch "${webInterfaceDir}" "master" || { echo " ${CROSS} Unable to pull Web master branch"; exit 1; }
|
|
fi
|
|
#echo -e " ${TICK} Web Interface"
|
|
local path
|
|
path="master/${binary}"
|
|
echo "master" > /etc/pihole/ftlbranch
|
|
chmod 644 /etc/pihole/ftlbranch
|
|
elif [[ "${1}" == "core" ]] ; then
|
|
str="Fetching branches from ${piholeGitUrl}"
|
|
echo -ne " ${INFO} $str"
|
|
if ! fully_fetch_repo "${PI_HOLE_FILES_DIR}" ; then
|
|
echo -e "${OVER} ${CROSS} $str"
|
|
exit 1
|
|
fi
|
|
corebranches=($(get_available_branches "${PI_HOLE_FILES_DIR}"))
|
|
|
|
if [[ "${corebranches[*]}" == *"master"* ]]; then
|
|
echo -e "${OVER} ${TICK} $str"
|
|
echo -e " ${INFO} ${#corebranches[@]} branches available for Pi-hole Core"
|
|
else
|
|
# Print STDERR output from get_available_branches
|
|
echo -e "${OVER} ${CROSS} $str\\n\\n${corebranches[*]}"
|
|
exit 1
|
|
fi
|
|
|
|
echo ""
|
|
# Have the user choose the branch they want
|
|
if ! (for e in "${corebranches[@]}"; do [[ "$e" == "${2}" ]] && exit 0; done); then
|
|
echo -e " ${INFO} Requested branch \"${2}\" is not available"
|
|
echo -e " ${INFO} Available branches for Core are:"
|
|
for e in "${corebranches[@]}"; do echo " - $e"; done
|
|
exit 1
|
|
fi
|
|
checkout_pull_branch "${PI_HOLE_FILES_DIR}" "${2}"
|
|
elif [[ "${1}" == "web" ]] && [[ "${INSTALL_WEB_INTERFACE}" == "true" ]] ; then
|
|
str="Fetching branches from ${webInterfaceGitUrl}"
|
|
echo -ne " ${INFO} $str"
|
|
if ! fully_fetch_repo "${webInterfaceDir}" ; then
|
|
echo -e "${OVER} ${CROSS} $str"
|
|
exit 1
|
|
fi
|
|
webbranches=($(get_available_branches "${webInterfaceDir}"))
|
|
|
|
if [[ "${webbranches[*]}" == *"master"* ]]; then
|
|
echo -e "${OVER} ${TICK} $str"
|
|
echo -e " ${INFO} ${#webbranches[@]} branches available for Web Admin"
|
|
else
|
|
# Print STDERR output from get_available_branches
|
|
echo -e "${OVER} ${CROSS} $str\\n\\n${webbranches[*]}"
|
|
exit 1
|
|
fi
|
|
|
|
echo ""
|
|
# Have the user choose the branch they want
|
|
if ! (for e in "${webbranches[@]}"; do [[ "$e" == "${2}" ]] && exit 0; done); then
|
|
echo -e " ${INFO} Requested branch \"${2}\" is not available"
|
|
echo -e " ${INFO} Available branches for Web Admin are:"
|
|
for e in "${webbranches[@]}"; do echo " - $e"; done
|
|
exit 1
|
|
fi
|
|
checkout_pull_branch "${webInterfaceDir}" "${2}"
|
|
elif [[ "${1}" == "ftl" ]] ; then
|
|
local path
|
|
path="${2}/${binary}"
|
|
|
|
if check_download_exists "$path"; then
|
|
echo " ${TICK} Branch ${2} exists"
|
|
echo "${2}" > /etc/pihole/ftlbranch
|
|
chmod 644 /etc/pihole/ftlbranch
|
|
FTLinstall "${binary}"
|
|
restart_service pihole-FTL
|
|
enable_service pihole-FTL
|
|
else
|
|
echo " ${CROSS} Requested branch \"${2}\" is not available"
|
|
ftlbranches=( $(git ls-remote https://github.com/pi-hole/ftl | grep 'heads' | sed 's/refs\/heads\///;s/ //g' | awk '{print $2}') )
|
|
echo -e " ${INFO} Available branches for FTL are:"
|
|
for e in "${ftlbranches[@]}"; do echo " - $e"; done
|
|
exit 1
|
|
fi
|
|
|
|
else
|
|
echo -e " ${INFO} Requested option \"${1}\" is not available"
|
|
exit 1
|
|
fi
|
|
|
|
# Force updating everything
|
|
if [[ ! "${1}" == "web" && ! "${1}" == "ftl" ]]; then
|
|
echo -e " ${INFO} Running installer to upgrade your installation"
|
|
if "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh" --unattended; then
|
|
exit 0
|
|
else
|
|
echo -e " ${COL_LIGHT_RED} Error: Unable to complete update, please contact support${COL_NC}"
|
|
exit 1
|
|
fi
|
|
fi
|
|
}
|