Initial commit

automated install/basic-install.sh

@@ -16,7 +16,7 @@
 #
 # curl -L install.pi-hole.net | bash
 
-######## VARIABLES #########
+######## FIRST CHECK ########
 # Must be root to install
 if [[ $EUID -eq 0 ]];then
 	echo "You are root."
@@ -31,11 +31,16 @@ else
 		exit 1
 	fi
 fi
-
+######## VARIABLES #########
-
 tmpLog=/tmp/pihole-install.log
 instalLogLoc=/etc/pihole/install.log
 
+WEB_INTERFACE_GIT_URL="https://github.com/jacobsalmela/AdminLTE.git"
+WEB_INTERFACE_DIR="/var/www/html/admin"
+PIHOLE_GIT_URL="https://github.com/jacobsalmela/AdminLTE.git"
+PIHOLE_FILES_DIR="/var/www/html/admin"
+
+
 # Find the rows and columns
 rows=$(tput lines)
 columns=$(tput cols)
@@ -54,11 +59,10 @@ dhcpcdFile=/etc/dhcpcd.conf
 
 ####### FUNCTIONS ##########
 ###All credit for the below function goes to http://fitnr.com/showing-a-bash-spinner.html
-spinner()
+spinner(){
-{
 	local pid=$1
 	local delay=0.001
-    local spinstr='|/-\'
+	local spinstr='/-\|'
 	while [ "$(ps a | awk '{print $1}' | grep $pid)" ]; do
 	local temp=${spinstr#?}
 	printf " [%c]  " "$spinstr"
@@ -70,8 +74,7 @@ spinner()
 }
 
 
-backupLegacyPihole()
+backupLegacyPihole(){
-{
 	if [[ -f /etc/dnsmasq.d/adList.conf ]];then
 		echo "Original Pi-hole detected.  Initiating sub space transport"
 		$SUDO mkdir -p /etc/pihole/original/
@@ -86,8 +89,7 @@ else
 	fi
 }
 
-welcomeDialogs()
+welcomeDialogs(){
-{
 	# Display the welcome dialog
 	whiptail --msgbox --backtitle "Welcome" --title "Pi-hole automated installer" "This installer will transform your Raspberry Pi into a network-wide ad blocker!" $r $c
 	
@@ -96,12 +98,10 @@ whiptail --msgbox --backtitle "Plea" --title "Free and open source" "The Pi-hole
 	
 	# Explain the need for a static address
 	whiptail --msgbox --backtitle "Initating network interface" --title "Static IP Needed" "The Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly.	
-
 	In the next section, you can choose to use your current network settings (DHCP) or to manually edit them." $r $c
 }
 
-chooseInterface()
+chooseInterface(){
-{
 # Turn the available interfaces into an array so it can be used with a whiptail dialog
 	interfacesArray=()
 	firstloop=1
@@ -120,6 +120,7 @@ done <<< "$availableInterfaces"
 	interfaceCount=$(echo "$availableInterfaces" | wc -l)
 	chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface" $r $c $interfaceCount)
 	chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty)
+	
 	for desiredInterface in $chooseInterfaceOptions
 	do
 		piholeInterface=$desiredInterface
@@ -128,8 +129,7 @@ do
 	done
 }
 
-use4andor6()
+use4andor6(){
-{
 	# Let use select IPv4 and/or IPv6
 	cmd=(whiptail --separate-output --checklist "Select Protocols" $r $c 2)
 	options=(IPv4 "Block ads over IPv4" on
@@ -165,29 +165,23 @@ done
 		echo "::: Exiting"
 		exit 1
 	fi
-	
 }
 
-useIPv6dialog()
+useIPv6dialog(){
-{
 	piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
 	whiptail --msgbox --backtitle "IPv6..." --title "IPv6 Supported" "$piholeIPv6 will be used to block ads." $r $c
 	$SUDO mkdir -p /etc/pihole/
 	$SUDO touch /etc/pihole/.useIPv6
 }
 
-getStaticIPv4Settings()
+getStaticIPv4Settings(){
-{
 	# Ask if the user wants to use DHCP settings as their static IP
 	if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Do you want to use your current network settings as a static address?
-
 									IP address:    $IPv4addr
 									Gateway:       $IPv4gw" $r $c) then
 		# If they choose yes, let the user know that the IP address will not be available via DHCP and may cause a conflict.
 		whiptail --msgbox --backtitle "IP information" --title "FYI: IP Conflict" "It is possible your router could still try to assign this IP to a device, which would cause a conflict.  But in most cases the router is smart enough to not do that.
-
 		If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want.
-
 		It is also possible to use a DHCP reservation, but if you are going to do that, you might as well set a static address." $r $c
 		# Nothing else to do since the variables are already set above
 	else
@@ -257,7 +251,6 @@ fi
 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
@@ -332,7 +325,6 @@ else
 		$SUDO echo "::: No need to create, already exists!"
 	fi
 	$SUDO echo "::: ...done."
-
 }
 
 installPiholeWeb(){
@@ -355,8 +347,7 @@ $SUDO curl -o /etc/cron.d/pihole https://raw.githubusercontent.com/jacobsalmela/
 	$SUDO echo "::: ...done."
 }
 
-runGravity()
+runGravity(){
-{
 	$SUDO echo " "
 	$SUDO echo "::: Preparing to run gravity.sh to refresh hosts..."
 	if ls /etc/pihole/list* 1> /dev/null 2>&1; then
@@ -368,9 +359,20 @@ fi
 	$SUDO echo "::: ...done."
 }
 
+checkForAndInstallDependencies(){
+	if [ -d "/var/www/html/admin" ]; then
+		#Likely an existing install, no need to apt-get update
+		echo "::: Previous installation detected"
+	else
+		echo "::: First time install, updating package list"
+		$SUDO apt-get -qq update & spinner $!
+		echo "::: Upgrading installed apt-get packages"
+		$SUDO apt-get -yqq upgrade & spinner $!
+	fi
+}
 
-installPihole()
+
-{
+installPihole(){
 	installDependencies
 	stopServices
 	$SUDO chown www-data:www-data /var/www/html
@@ -383,7 +385,6 @@ installWebAdmin
 	installPiholeWeb
 	installCron
 	runGravity
-
 }
 
 displayFinalMessage(){
@@ -403,13 +404,12 @@ welcomeDialogs
 
 # Just back up the original Pi-hole right away since it won't take long and it gets it out of the way
 backupLegacyPihole
-
 # Find interfaces and let the user choose one
 chooseInterface
-
 # Let the user decide if they want to block ads over IPv4 and/or IPv6
 use4andor6
 
+checkForAndInstallDependencies
 
 # Install and log everything to a file
 installPihole | tee $tmpLog