mirror of https://github.com/pi-hole/pi-hole
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
234 lines
7.3 KiB
234 lines
7.3 KiB
#!/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
|
|
|
|
source "${setupVars}"
|
|
update="false"
|
|
|
|
coltable="/opt/pihole/COL_TABLE"
|
|
source ${coltable}
|
|
|
|
fully_fetch_repo() {
|
|
# Add upstream branches to shallow clone
|
|
local directory="${1}"
|
|
|
|
cd "${directory}" || return 1
|
|
if is_repo "${directory}"; then
|
|
git remote set-branches origin '*' || return 1
|
|
git fetch --quiet || return 1
|
|
else
|
|
return 1
|
|
fi
|
|
return 0
|
|
}
|
|
|
|
get_available_branches() {
|
|
# Return available branches
|
|
local directory="${1}"
|
|
local output
|
|
|
|
cd "${directory}" || return 1
|
|
# Get reachable remote branches, but store STDERR as STDOUT variable
|
|
output=$( { git remote show origin | grep 'tracked' | sed 's/tracked//;s/ //g'; } 2>&1 )
|
|
echo "$output"
|
|
return
|
|
}
|
|
|
|
|
|
fetch_checkout_pull_branch() {
|
|
# Check out specified branch
|
|
local directory="${1}"
|
|
local branch="${2}"
|
|
|
|
# Set the reference for the requested branch, fetch, check it put and pull it
|
|
cd "${directory}"
|
|
git remote set-branches origin "${branch}" || return 1
|
|
git stash --all --quiet &> /dev/null || true
|
|
git clean --force -d || true
|
|
git fetch --quiet || return 1
|
|
checkout_pull_branch "${directory}" "${branch}" || return 1
|
|
}
|
|
|
|
checkout_pull_branch() {
|
|
# Check out specified branch
|
|
local directory="${1}"
|
|
local branch="${2}"
|
|
local oldbranch
|
|
|
|
cd "${directory}" || return 1
|
|
|
|
oldbranch="$(git symbolic-ref HEAD)"
|
|
|
|
git checkout "${branch}" || return 1
|
|
|
|
if [[ "$(git diff "${oldbranch}" | grep -c "^")" -gt "0" ]]; then
|
|
update="true"
|
|
fi
|
|
|
|
git_pull=$(git pull || return 1)
|
|
|
|
if [[ "$git_pull" == *"up-to-date"* ]]; then
|
|
echo -e "\n ${INFO} $(git pull)"
|
|
else
|
|
echo -e "$git_pull\n"
|
|
fi
|
|
|
|
return 0
|
|
}
|
|
|
|
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
|
|
|
|
# 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!
|
|
Please re-run install script from https://github.com/pi-hole/pi-hole${COL_NC}"
|
|
exit 1;
|
|
fi
|
|
if [[ ${INSTALL_WEB} == "true" ]]; then
|
|
if ! is_repo "${webInterfaceDir}" ; then
|
|
echo -e " ${COL_LIGHT_RED}Error: Web Admin repo is missing from system!
|
|
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}
|
|
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 -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} == "true" ]]; then
|
|
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"
|
|
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} == "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"
|
|
|
|
elif [[ "${1}" == "core" ]] ; then
|
|
str="Fetching branches from ${piholeGitUrl}"
|
|
echo -ne " ${INFO} $str"
|
|
if ! fully_fetch_repo "${PI_HOLE_FILES_DIR}" ; then
|
|
echo -e " ${CROSS} $str"
|
|
exit 1
|
|
fi
|
|
corebranches=($(get_available_branches "${PI_HOLE_FILES_DIR}"))
|
|
|
|
if [[ "${corebranches[@]}" == *"master"* ]]; then
|
|
echo -e "${OVER} ${TICK} $str
|
|
${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}" == "true" ]] ; then
|
|
str="Fetching branches from ${webInterfaceGitUrl}"
|
|
echo -ne " ${INFO} $str"
|
|
if ! fully_fetch_repo "${webInterfaceDir}" ; then
|
|
echo -e " ${CROSS} $str"
|
|
exit 1
|
|
fi
|
|
webbranches=($(get_available_branches "${webInterfaceDir}"))
|
|
|
|
if [[ "${corebranches[@]}" == *"master"* ]]; then
|
|
echo -e "${OVER} ${TICK} $str
|
|
${INFO} ${#webbranches[@]} branches available for Web Admin"
|
|
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 "${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}"
|
|
else
|
|
echo -e " ${INFO} Requested option \"${1}\" is not available"
|
|
exit 1
|
|
fi
|
|
|
|
# Force updating everything
|
|
if [[ ! "${1}" == "web" && "${update}" == "true" ]]; 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
|
|
}
|