bkruse: branch aadk r802 - in /branches/aadk: ./ config/ config/scripts/

[asterisk-gui-commits at lists.digium.com]

Author: bkruse
Date: Fri Apr 27 16:01:51 2007
New Revision: 802

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=802
Log:
Merged revisions 801 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r801 | bkruse | 2007-04-27 15:54:54 -0500 (Fri, 27 Apr 2007) | 1 line

[1] Fixed the makefile so that scripts now install into /var/lib/asterisk/scripts instead of /etc/asterisk/scripts [2] Put a global var in astman.js so that you can now reference that script directory no matter if it changes in the future or not [3] Added that proof of concept into config/graphs.html
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/Makefile
    branches/aadk/config/graphs.html
    branches/aadk/config/scripts/astman.js

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 27 16:01:51 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-796
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-801

Modified: branches/aadk/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/Makefile?view=diff&rev=802&r1=801&r2=802
==============================================================================
--- branches/aadk/Makefile (original)
+++ branches/aadk/Makefile Fri Apr 27 16:01:51 2007
@@ -173,7 +173,7 @@
 		exit 1; \
 	fi
 	@echo -n "Checking for the network configuration script: "
-	@if [ -f $(ASTETCDIR)/scripts/networking.sh ]; then \
+	@if [ -f $(ASTVARLIBDIR)/scripts/networking.sh ]; then \
 		echo "OK"; \
 	else \
 		echo "NOT FOUND"; \
@@ -181,7 +181,7 @@
 		exit 1; \
 	fi
 	@echo -n "Checking for the backend script for graph data: "
-	@if [ -f $(ASTETCDIR)/scripts/graphs.sh ]; then \
+	@if [ -f $(ASTVARLIBDIR)/scripts/graphs.sh ]; then \
 		echo "OK"; \
 	else \
 		echo "NOT FOUND"; \
@@ -231,7 +231,7 @@
 	mkdir -p $(CONFIGDIR)/bkps
 	mkdir -p $(CONFIGDIR)/setup
 	mkdir -p $(CONFIGDIR)/graphs
-	mkdir -p $(ASTETCDIR)/scripts
+	mkdir -p $(ASTVARLIBDIR)/scripts
 	@for x in gui_configs/*; do \
 		echo "$$x  -->  $(ASTETCDIR)" ; \
 		cp $$x $(ASTETCDIR)/ ; \
@@ -257,8 +257,8 @@
 		$(INSTALL) -m 644 $$x $(CONFIGDIR)/ ; \
 	done
 	@for x in scripts/*; do \
-		echo "$$x  -->  $(ASTETCDIR)/scripts" ; \
-		$(INSTALL) -m 755 $$x $(ASTETCDIR)/scripts ; \
+		echo "$$x  -->  $(ASTVARLIBDIR)/scripts" ; \
+		$(INSTALL) -m 755 $$x $(ASTVARLIBDIR)/scripts ; \
 	done
 	@for x in config/graphs/*; do \
 		echo "$$x  -->  $(CONFIGDIR)/graphs" ; \

Modified: branches/aadk/config/graphs.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/graphs.html?view=diff&rev=802&r1=801&r2=802
==============================================================================
--- branches/aadk/config/graphs.html (original)
+++ branches/aadk/config/graphs.html Fri Apr 27 16:01:51 2007
@@ -32,7 +32,7 @@
 var divs_tohide = new Array('cpu_div');
 
 function update_graph(graph) {
-	var tmp_command = "sh /etc/asterisk/scripts/graphs.sh > /var/lib/asterisk/static-http/config/graphs/data_cpu.html";
+	var tmp_command = "sh " + asterisk_scriptsFolder + "graphs.sh cpu > /var/lib/asterisk/static-http/config/graphs/data_cpu.html";
 	parent.astmanEngine.run_tool(tmp_command);
 	return true;
 	}

Modified: branches/aadk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/scripts/astman.js?view=diff&rev=802&r1=801&r2=802
==============================================================================
--- branches/aadk/config/scripts/astman.js (original)
+++ branches/aadk/config/scripts/astman.js Fri Apr 27 16:01:51 2007
@@ -38,6 +38,7 @@
 var asterisk_guiListFiles = "sh /etc/asterisk/scripts/listfiles" ;
 var asterisk_guiapplyUimage = "flashupdate file " ;
 var asterisk_guiUploads_path_appliance = "/var/lib/asterisk/sounds/uploads/" ;
+var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */
 
 var sortbynames = false;
 var dragdata = new Object;