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

add reconfigure flag to -r command

Browse source
This commit is contained in:
Promofaux 2016-10-15 20:43:03 +01:00
parent 7e10dcdcf0
commit a43577fa26
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
automated install/basic-install.sh
View file

@ -40,6 +40,11 @@ columns=$(tput cols)
r=$(( rows / 2 )) r=$(( rows / 2 ))
c=$(( columns / 2 )) c=$(( columns / 2 ))
######## Flags. Shhh ########
skipSpaceCheck=false
skipRepoUpdate=false
runUnattended=false
######## FIRST CHECK ######## ######## FIRST CHECK ########
# Must be root to install # Must be root to install
echo ":::" echo ":::"
@ -884,8 +889,18 @@ update_dialogs(){
} }
main() { main() {
for var in "$@"
do
case "$var" in
"--reconfigure" ) skipRepoUpdate=true;;
"--i_do_not_follow_recommendations" ) skipSpaceCheck=false;;
"--unattended" ) runUnattended=true;;
esac
done
if [[ -f ${setupVars} ]];then if [[ -f ${setupVars} ]];then
if [ "$1" == "pihole" ]; then if [ "$runUnattended" = true ]; then
useUpdateVars=true useUpdateVars=true
else else
update_dialogs update_dialogs
@ -894,7 +909,7 @@ fi
# Start the installer # Start the installer
# Verify there is enough disk space for the install # Verify there is enough disk space for the install
if [[ $1 = "--i_do_not_follow_recommendations" ]]; then if [[ "$skipSpaceCheck" = true ]]; then
echo "::: --i_do_not_follow_recommendations passed to script" echo "::: --i_do_not_follow_recommendations passed to script"
echo "::: skipping free disk space verification!" echo "::: skipping free disk space verification!"
else else

4
pihole
View file

@ -99,7 +99,7 @@ updatePiholeFunc() {
echo "::: Fetching latest changes from GitHub..." echo "::: Fetching latest changes from GitHub..."
cd /etc/.pihole cd /etc/.pihole
git pull origin master git pull origin master
/etc/.pihole/automated\ install/basic-install.sh pihole /etc/.pihole/automated\ install/basic-install.sh --unattended
echo ":::" echo ":::"
echo "::: Pi-hole has been updated to version ${piholeVersionLatest}" echo "::: Pi-hole has been updated to version ${piholeVersionLatest}"
@ -114,7 +114,7 @@ updatePiholeFunc() {
} }
reconfigurePiholeFunc() { reconfigurePiholeFunc() {
/etc/.pihole/automated\ install/basic-install.sh /etc/.pihole/automated\ install/basic-install.sh --reconfigure
exit 0; exit 0;
} }