From fa0939d38a2d1ed17a326b7401034c1149abcae0 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 23 Jan 2016 06:41:21 +0000 Subject: [PATCH] Fix paths to new repo --- automated install/basic-install.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 17e832b7..22776a31 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -269,12 +269,12 @@ installScripts(){ $SUDO echo " " $SUDO echo "::: Installing scripts..." #$SUDO rm /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh -$SUDO curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh -$SUDO curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh -$SUDO curl -o /usr/local/bin/whitelist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/whitelist.sh -$SUDO curl -o /usr/local/bin/blacklist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/blacklist.sh -$SUDO curl -o /usr/local/bin/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh -$SUDO curl -o /usr/local/bin/updateDashboard.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/updateDashboard.sh +$SUDO curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/gravity.sh +$SUDO curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/Scripts/chronometer.sh +$SUDO curl -o /usr/local/bin/whitelist.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/Scripts/whitelist.sh +$SUDO curl -o /usr/local/bin/blacklist.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/Scripts/blacklist.sh +$SUDO curl -o /usr/local/bin/piholeLogFlush.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/Scripts/piholeLogFlush.sh +$SUDO curl -o /usr/local/bin/updateDashboard.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/Scripts/updateDashboard.sh $SUDO chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh $SUDO echo "::: ...done." } @@ -284,8 +284,8 @@ $SUDO echo " " $SUDO echo "::: Installing configs..." $SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig $SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig -$SUDO curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf -$SUDO curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf +$SUDO curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/dnsmasq.conf +$SUDO curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/lighttpd.conf $SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf $SUDO echo "::: ...done." } @@ -328,7 +328,7 @@ fi if [ -d "/var/www/html/AdminLTE-master" ]; then $SUDO rm -rf /var/www/html/AdminLTE-master fi -$SUDO wget -nv https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip & spinner $! +$SUDO wget -nv https://github.com/pi-hole/AdminLTE/archive/master.zip -O /var/www/master.zip & spinner $! $SUDO unzip -oq /var/www/master.zip -d /var/www/html/ $SUDO mv /var/www/html/AdminLTE-master /var/www/html/admin $SUDO rm /var/www/master.zip 2>/dev/null @@ -354,7 +354,7 @@ if [ -d "/var/www/html/pihole" ]; then else $SUDO mkdir /var/www/html/pihole $SUDO mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig - $SUDO curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html + $SUDO curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/index.html fi $SUDO echo "::: ...done." } @@ -362,7 +362,7 @@ $SUDO echo "::: ...done." installCron(){ $SUDO echo " " $SUDO echo "::: Downloading latest Cron script..." -$SUDO curl -o /etc/cron.d/pihole https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron +$SUDO curl -o /etc/cron.d/pihole https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/pihole.cron $SUDO echo "::: ...done." }