Merge pull request #609 from pi-hole/CLI_VersionCheck

Cli version check

advanced/Scripts/version.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Pi-hole: A black hole for Internet advertisements
+# (c) 2015, 2016 by Jacob Salmela
+# Network-wide ad blocking via your Raspberry Pi
+# http://pi-hole.net
+# Whitelists domains
+#
+# 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
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
+piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
+webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
+
+piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
+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 "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
+echo "::: Web-Admin version is $webVersion (Latest version is $webVersionLatest)"

automated install/basic-install.sh

@@ -547,7 +547,8 @@ installScripts() {
 	$SUDO cp /etc/.pihole/advanced/Scripts/updateDashboard.sh /opt/pihole/updateDashboard.sh
 	$SUDO cp /etc/.pihole/automated\ install/uninstall.sh /opt/pihole/uninstall.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/setupLCD.sh /opt/pihole/setupLCD.sh
-	$SUDO chmod 755 /opt/pihole/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard,uninstall,setupLCD}.sh
+	$SUDO cp /etc/.pihole/advanced/Scripts/version.sh /opt/pihole/version.sh
+	$SUDO chmod 755 /opt/pihole/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard,uninstall,setupLCD,version}.sh
 	$SUDO cp /etc/.pihole/pihole /usr/local/bin/pihole
 	$SUDO chmod 755 /usr/local/bin/pihole
 	$SUDO cp /etc/.pihole/advanced/bash-completion/pihole /etc/bash_completion.d/pihole

pihole

@@ -74,6 +74,11 @@ function uninstallFunc {
     exit 1
 }
 
+function versionFunc {
+    $SUDO /opt/pihole/version.sh
+    exit 1
+}
+
 function helpFunc {
     echo "::: Control all PiHole specific functions!"
     echo ":::"
@@ -90,7 +95,8 @@ function helpFunc {
     echo ":::  -s, setupLCD             Automatically configures the Pi to use the 2.8 LCD screen to display stats on it"
     echo ":::  -c, chronometer          Calculates stats and displays to an LCD"
     echo ":::  -h, help                 Show this help dialog"
-	echo ":::  uninstall				Uninstall Pi-Hole from your system!"
+    echo ":::  -v, version              Show current versions"
+    echo ":::  uninstall                Uninstall Pi-Hole from your system :(!"
     exit 1
 }
 
@@ -109,6 +115,7 @@ case "$1" in
 "-s" | "setupLCD"			) setupLCDFunction;;
 "-c" | "chronometer"		) chronometerFunc "$@";;
 "-h" | "help"				) helpFunc;;
+"-v" | "version"            ) versionFunc;;
 "uninstall"					) uninstallFunc;;
 *                    		) helpFunc;;
 esac