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

Retrieve local repos on repair (#1481)

Browse source 
* Retrieve local repos on repair

* Change conditional to check for repair
* Change wording of Update/Reconfigure message
* Fixed indenting

* Perform "git reset --hard" on reconfigure
This commit is contained in:
WaLLy3K 2017-05-22 06:47:26 +10:00 committed by DL6ER
parent c655e6ea73
commit 2ef87ad110
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
automated install/basic-install.sh
View file

@ -1180,22 +1180,23 @@ update_dialogs() {
} }
clone_or_update_repos() { clone_or_update_repos() {
if [[ "${reconfigure}" == true ]]; then if [[ "${reconfigure}" == true ]]; then
echo "::: --reconfigure passed to install script. Not downloading/updating local repos" echo "::: --reconfigure passed to install script. Resetting changes to local repos"
else git reset --hard
# Get Git files for Core and Admin else
getGitFiles ${PI_HOLE_LOCAL_REPO} ${piholeGitUrl} || \ # Get Git files for Core and Admin
{ echo "!!! Unable to clone ${piholeGitUrl} into ${PI_HOLE_LOCAL_REPO}, unable to continue."; \ getGitFiles ${PI_HOLE_LOCAL_REPO} ${piholeGitUrl} || \
exit 1; \ { echo "!!! Unable to clone ${piholeGitUrl} into ${PI_HOLE_LOCAL_REPO}, unable to continue."; \
} exit 1; \
}
if [[ ${INSTALL_WEB} == true ]]; then if [[ ${INSTALL_WEB} == true ]]; then
getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl} || \ getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl} || \
{ echo "!!! Unable to clone ${webInterfaceGitUrl} into ${webInterfaceDir}, unable to continue."; \ { echo "!!! Unable to clone ${webInterfaceGitUrl} into ${webInterfaceDir}, unable to continue."; \
exit 1; \ exit 1; \
} }
fi
fi fi
fi
} }
FTLinstall() { FTLinstall() {