From b429e890add80798222bcdae83c66ef50e627e1e Mon Sep 17 00:00:00 2001
From: Promofaux <adzjwarner@gmail.com>
Date: Wed, 2 Nov 2016 20:16:36 +0000
Subject: [PATCH] move web interface message inside "if not update" block.
 Check for pi-hole deps AFTER whiptails

---
 .idea/codeStyleSettings.xml        | 22 ++++++++++++++++++++++
 automated install/basic-install.sh | 10 +++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 .idea/codeStyleSettings.xml

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 00000000..a571e63f
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="OTHER_INDENT_OPTIONS">
+          <value>
+            <option name="INDENT_SIZE" value="2" />
+            <option name="CONTINUATION_INDENT_SIZE" value="8" />
+            <option name="TAB_SIZE" value="2" />
+            <option name="USE_TAB_CHARACTER" value="false" />
+            <option name="SMART_TABS" value="false" />
+            <option name="LABEL_INDENT_SIZE" value="0" />
+            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+            <option name="USE_RELATIVE_INDENTS" value="false" />
+          </value>
+        </option>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index fb048ec2..2e8ae77d 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -1061,9 +1061,6 @@ main() {
 	# Install packages used by this installation script
 	install_dependent_packages INSTALLER_DEPS[@]
 
-	# Install packages used by the Pi-hole
-	install_dependent_packages PIHOLE_DEPS[@]
-
 	if [[ "${reconfigure}" == true ]]; then
 		echo "::: --reconfigure passed to install script. Not downloading/updating local repos"
 	else
@@ -1094,11 +1091,14 @@ main() {
 		setLogging
 
 		# Install packages used by the Pi-hole
-	    install_dependent_packages PIHOLE_DEPS[@]
+	  install_dependent_packages PIHOLE_DEPS[@]
 
 		# Install and log everything to a file
     installPihole | tee ${tmpLog}
 	else
+	  # update packages used by the Pi-hole
+	  install_dependent_packages PIHOLE_DEPS[@]
+
 		updatePihole | tee ${tmpLog}
 	fi
 
@@ -1124,13 +1124,13 @@ main() {
 		echo ":::     ${IPV6_ADDRESS}"
 		echo ":::"
 		echo "::: If you set a new IP address, you should restart the Pi."
+    echo "::: View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin"
 	else
 		echo "::: Update complete!"
 	fi
 
 	echo ":::"
 	echo "::: The install log is located at: /etc/pihole/install.log"
-	echo "::: View the web interface at http://pi.hole/admin or http://${IPV4_ADDRESS%/*}/admin"
 }
 
 if [[ -z "$PHTEST" ]] ; then