diff --git a/advanced/Functions/install.funcs b/advanced/Functions/install.funcs index 3cf1e680..11ac89f3 100644 --- a/advanced/Functions/install.funcs +++ b/advanced/Functions/install.funcs @@ -273,6 +273,7 @@ installScripts() { $SUDO cp /etc/.pihole/advanced/Scripts/blacklist.sh /usr/local/bin/blacklist.sh $SUDO cp /etc/.pihole/advanced/Scripts/piholeLogFlush.sh /usr/local/bin/piholeLogFlush.sh $SUDO cp /etc/.pihole/advanced/Scripts/updateDashboard.sh /usr/local/bin/updateDashboard.sh + $SUDO cp -R /etc/.pihole/advanced/Functions /etc/pihole/ $SUDO chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh $SUDO echo " done." } @@ -345,6 +346,25 @@ checkForDependencies() { done } +getGitFiles() { + # Setup git repos for base files and web admin + echo ":::" + echo "::: Checking for existing base files..." + if is_repo $piholeFilesDir; then + make_repo $piholeFilesDir $piholeGitUrl + else + update_repo $piholeFilesDir + fi + + echo ":::" + echo "::: Checking for existing web interface..." + if is_repo $webInterfaceDir; then + make_repo $webInterfaceDir $webInterfaceGitUrl + else + update_repo $webInterfaceDir + fi +} + CreateLogFile() { # Create logfiles if necessary echo ":::" diff --git a/automated install/install.sh b/automated install/install.sh index 266bb5af..1538baa4 100755 --- a/automated install/install.sh +++ b/automated install/install.sh @@ -15,15 +15,20 @@ if [ ! -d /tmp/piholeInstall ]; then mkdir -p /tmp/piholeInstall fi -curl -o /tmp/piholeInstall/pihole.var https://raw.githubusercontent.com/pi-hole/pi-hole/ExportVariables/advanced/Functions/pihole.var +#curl -o /tmp/piholeInstall/pihole.var https://raw.githubusercontent.com/pi-hole/pi-hole/ExportVariables/advanced/Functions/pihole.var #curl -o /tmp/piholeInstall/pihole.funcs https://raw.githubusercontent.com/pi-hole/pi-hole/ExportVariables/advanced/Functions/pihole.funcs -curl -o /tmp/piholeInstall/install.funcs https://raw.githubusercontent.com/pi-hole/pi-hole/ExportVariables/advanced/Functions/install.funcs -curl -o /tmp/piholeInstall/git.funcs https://raw.githubusercontent.com/pi-hole/pi-hole/ExportVariables/advanced/Functions/git.funcs +#curl -o /tmp/piholeInstall/install.funcs https://raw.githubusercontent.com/pi-hole/pi-hole/ExportVariables/advanced/Functions/install.funcs +#curl -o /tmp/piholeInstall/git.funcs https://raw.githubusercontent.com/pi-hole/pi-hole/ExportVariables/advanced/Functions/git.funcs -source /tmp/piholeInstall/pihole.var -source /tmp/piholeInstall/pihole.funcs -source /tmp/piholeInstall/install.funcs -source /tmp/piholeInstall/git.funcs +#source /tmp/piholeInstall/pihole.var +#source /tmp/piholeInstall/pihole.funcs +#source /tmp/piholeInstall/install.funcs +#source /tmp/piholeInstall/git.funcs + +source /etc/.pihole/advanced/Functions/pihole.var +source /etc/.pihole/advanced/Functions/pihole.funcs +source /etc/.pihole/advanced/Functions/install.funcs +source /etc/.pihole/advanced/Functions/git.funcs ###########Begin Script RootCheck