bkruse: trunk r3415 - in /trunk: Makefile config/scripts/astman.js

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Thu Jul  3 15:42:29 2008
New Revision: 3415

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=3415
Log:
Changed Makefile to actually put the correct
revision in astman.js (for display in the
system info tab, so the user can actually
report the correct revision)

Thanks seanbright for the svnversion command
over the cut hack.

(closes issue #12988)

Modified:
    trunk/Makefile
    trunk/config/scripts/astman.js

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-gui/trunk/Makefile?view=diff&rev=3415&r1=3414&r2=3415
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jul  3 15:42:29 2008
@@ -254,7 +254,19 @@
 		/usr/sbin/asterisk-gui-post-install $(DESTDIR) . ; \
 	fi
 
-install: _install
+_getversion:
+	@if [ -d .svn ]; then \
+		svnrev="$(shell svnversion -n)" ; \
+		sed -i "s/var asterisk_guiversion.*/var asterisk_guiversion = \"$${svnrev}\"/" $(CONFIGDIR)/scripts/astman.js ; \
+		echo "Set GUI Svn Revision --> $${svnrev}" ; \
+	else \
+		svnrev="$(shell echo "Unknown - $(shell basename `pwd`)")" ; \
+		sed -i "s/var asterisk_guiversion.*/var asterisk_guiversion = \"$${svnrev}\"/" $(CONFIGDIR)/scripts/astman.js ; \
+		echo "Not under version control";  \
+		echo "Set GUI Revision to current directory --> $${svnrev}" ; \
+	fi
+
+install: _install _getversion
 	@echo " +---- Asterisk GUI Installation Complete ---+"
 	@echo " +                                           +"
 	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"

Modified: trunk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/astman.js?view=diff&rev=3415&r1=3414&r2=3415
==============================================================================
--- trunk/config/scripts/astman.js (original)
+++ trunk/config/scripts/astman.js Thu Jul  3 15:42:29 2008
@@ -24,7 +24,7 @@
 var asterisk_guiappname =  "Asterisk GUI";
 var asterisk_guitools = "asterisk_guitools";
 var asterisk_guitoolsversion = "0.7";
-var asterisk_guiversion = "$Revision$";
+var asterisk_guiversion = "Version set on Install"
 var asterisk_guifbt = 3000; // Feedback msg time
 var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (listfiles, for example) */
 var asterisk_guiNetworkSettings = "sh " + asterisk_scriptsFolder + "networking.sh";