arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity

Change directory before trying to reset repository. Fixes #1489

Browse Source
This commit is contained in:
DL6ER 2017-05-22 23:43:52 +02:00
parent 2ef87ad110
commit 74eb8c8622
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
automated install/basic-install.sh
View File

@ -220,6 +220,19 @@ getGitFiles() {
return 0 return 0
} }
resetRepo() {
local directory="${1}"
local curdir
curdir="${PWD}"
cd "${directory}" &> /dev/null || return 1
echo -n "::: Resetting repo in ${1}..."
git reset --hard &> /dev/null || return $?
echo " done!"
cd "${curdir}" &> /dev/null || return 1
return 0
}
find_IPv4_information() { find_IPv4_information() {
local route local route
# Find IP used to route to outside world # Find IP used to route to outside world
@ -1182,7 +1195,16 @@ update_dialogs() {
clone_or_update_repos() { clone_or_update_repos() {
if [[ "${reconfigure}" == true ]]; then if [[ "${reconfigure}" == true ]]; then
echo "::: --reconfigure passed to install script. Resetting changes to local repos" echo "::: --reconfigure passed to install script. Resetting changes to local repos"
git reset --hard resetRepo ${PI_HOLE_LOCAL_REPO} || \
{ echo "!!! Unable to reset ${PI_HOLE_LOCAL_REPO}, unable to continue."; \
exit 1; \
}
if [[ ${INSTALL_WEB} == true ]]; then
resetRepo ${webInterfaceDir} || \
{ echo "!!! Unable to reset ${webInterfaceDir}, unable to continue."; \
exit 1; \
}
fi
else else
# Get Git files for Core and Admin # Get Git files for Core and Admin
getGitFiles ${PI_HOLE_LOCAL_REPO} ${piholeGitUrl} || \ getGitFiles ${PI_HOLE_LOCAL_REPO} ${piholeGitUrl} || \