Retrieve local repos on repair (#1481)

* 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
pull/1351/head^2
WaLLy3K 7 years ago committed by DL6ER
parent c655e6ea73
commit 2ef87ad110

@ -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
getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl} || \ if [[ ${INSTALL_WEB} == true ]]; then
{ echo "!!! Unable to clone ${webInterfaceGitUrl} into ${webInterfaceDir}, unable to continue."; \ getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl} || \
exit 1; \ { echo "!!! Unable to clone ${webInterfaceGitUrl} into ${webInterfaceDir}, unable to continue."; \
} exit 1; \
fi }
fi fi
fi
} }
FTLinstall() { FTLinstall() {

Loading…
Cancel
Save