tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Testing alternative way of fetching/checking out of a single branch

This commit is contained in:
DL6ER 2017-03-11 16:11:23 +01:00
parent 41e1e4cb68
commit 1d60b62e7a
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
advanced/Scripts/piholeCheckout.sh
View File

@ -40,6 +40,24 @@ get_available_branches(){
return return
} }
fetch_checkout_pull_branch() {
# Check out specified branch
local directory="${1}"
local branch="${2}"
# Check if branch exists locally
if git rev-parse --quiet --verify development &> /dev/null; then
# Branch exists locally, we can check it out and pull it
checkout_pull_branch "${directory}" "${branch}" || return 1
else
# Branch does not exist locally, we set the reference for it, fetch, check it put and pull it
git remote set-branches origin "${branch}" || return 1
git fetch --quiet || return 1
checkout_pull_branch "${directory}" "${branch}" || return 1
fi
}
checkout_pull_branch() { checkout_pull_branch() {
# Check out specified branch # Check out specified branch
local directory="${1}" local directory="${1}"
@ -97,17 +115,17 @@ checkout()
# Shortcut to check out development branches # Shortcut to check out development branches
echo "::: Shortcut \"dev\" detected - checking out development / devel branches ..." echo "::: Shortcut \"dev\" detected - checking out development / devel branches ..."
echo "::: Pi-hole core" echo "::: Pi-hole core"
checkout_pull_branch "${PI_HOLE_FILES_DIR}" "development" || { echo "Unable to pull Core developement branch"; exit 1; } fetch_checkout_pull_branch "${PI_HOLE_FILES_DIR}" "development" || { echo "Unable to pull Core developement branch"; exit 1; }
echo "::: Web interface" echo "::: Web interface"
checkout_pull_branch "${webInterfaceDir}" "devel" || { echo "Unable to pull Web development branch"; exit 1; } fetch_checkout_pull_branch "${webInterfaceDir}" "devel" || { echo "Unable to pull Web development branch"; exit 1; }
echo "::: done!" echo "::: done!"
elif [[ "${1}" == "master" ]] ; then elif [[ "${1}" == "master" ]] ; then
# Shortcut to check out master branches # Shortcut to check out master branches
echo "::: Shortcut \"master\" detected - checking out master branches ..." echo "::: Shortcut \"master\" detected - checking out master branches ..."
echo "::: Pi-hole core" echo "::: Pi-hole core"
checkout_pull_branch "${PI_HOLE_FILES_DIR}" "master" || { echo "Unable to pull Core master branch"; exit 1; } fetch_checkout_pull_branch "${PI_HOLE_FILES_DIR}" "master" || { echo "Unable to pull Core master branch"; exit 1; }
echo "::: Web interface" echo "::: Web interface"
checkout_pull_branch "${webInterfaceDir}" "master" || { echo "Unable to pull web master branch"; exit 1; } fetch_checkout_pull_branch "${webInterfaceDir}" "master" || { echo "Unable to pull web master branch"; exit 1; }
echo "::: done!" echo "::: done!"
elif [[ "${1}" == "core" ]] ; then elif [[ "${1}" == "core" ]] ; then
echo -n "::: Fetching remote branches for Pi-hole core from ${piholeGitUrl} ... " echo -n "::: Fetching remote branches for Pi-hole core from ${piholeGitUrl} ... "