From b66f23cfd0778d57eb13baa209b4632726ada32f Mon Sep 17 00:00:00 2001
From: Adam Warner <awarner@croydon.parkeon.com>
Date: Tue, 18 Oct 2016 14:19:44 +0100
Subject: [PATCH] account for new update script

---
 advanced/Scripts/version.sh |  4 ++--
 pihole                      | 16 +++-------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/advanced/Scripts/version.sh b/advanced/Scripts/version.sh
index e77fdfc2..61ff7502 100644
--- a/advanced/Scripts/version.sh
+++ b/advanced/Scripts/version.sh
@@ -3,7 +3,7 @@
 # (c) 2015, 2016 by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
-# Whitelists domains
+# shows version numbers
 #
 # Pi-hole is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,6 +44,7 @@ webOutput(){
     else
         webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
         webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
+        echo "::: Web-Admin version is $webVersion (Latest version is $webVersionLatest)"
     fi
 }
 
@@ -97,6 +98,5 @@ do
     "-a" | "--admin"     ) shift; webOutput "$@";;
     "-p" | "--pihole"    ) shift; coreOutput "$@" ;;
     "-h" | "--help"      ) helpFunc;;
-    *                    ) helpFunc;;
   esac
 done
\ No newline at end of file
diff --git a/pihole b/pihole
index 0e29b23e..6be32acf 100755
--- a/pihole
+++ b/pihole
@@ -43,20 +43,10 @@ flushFunc() {
     exit 0
 }
 
-getGitFiles() {
-	# Setup git repos for directory and repository passed
-	# as arguments 1 and 2
-	echo ":::"
-	echo "::: Checking for existing repository..."
-	if is_repo "${1}"; then
-	  update_repo "${1}"
-	else
-	  make_repo "${1}" "${2}"
-  fi
-}
 
 updatePiholeFunc() {
-    echo "Not Implemented"
+    /opt/pihole/update.sh
+    exit 0
 }
 
 reconfigurePiholeFunc() {
@@ -110,7 +100,7 @@ helpFunc() {
     echo "::: Control all PiHole specific functions!"
     echo ":::"
     echo "::: Usage: pihole [options]"
-    echo ":::		Add -h after -w (whitelist), -b (blacklist), or -c (chronometer), or -v (version)  for more information on usage"
+    echo ":::		Add -h after -w (whitelist), -b (blacklist), or -c (chronometer)  for more information on usage"
     echo ":::"
     echo "::: Options:"
     echo ":::  -w, whitelist            Whitelist domains"