bkruse: branch asterisknow r803 - in /branches/asterisknow: ./ config/ config...

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

Author: bkruse
Date: Fri Apr 27 16:03:42 2007
New Revision: 803

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=803
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/asterisknow/   (props changed)
    branches/asterisknow/Makefile
    branches/asterisknow/config/graphs.html
    branches/asterisknow/config/scripts/astman.js

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 27 16:03:42 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-796
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-802

Modified: branches/asterisknow/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/Makefile?view=diff&rev=803&r1=802&r2=803
==============================================================================
--- branches/asterisknow/Makefile (original)
+++ branches/asterisknow/Makefile Fri Apr 27 16:03:42 2007
@@ -194,19 +194,19 @@
 	@echo "Installing into $(HTTPDIR)"
 	mkdir -p $(CONFIGDIR)
 	mkdir -p $(CONFIGDIR)/images
-	mkdir -p $(CONFIGDIR)/scripts
 	mkdir -p $(CONFIGDIR)/stylesheets
 	mkdir -p $(CONFIGDIR)/bkps
 	mkdir -p $(CONFIGDIR)/setup
 	mkdir -p $(CONFIGDIR)/graphs
-	mkdir -p $(ASTETCDIR)/scripts
+	mkdir -p $(CONFIGDIR)/scripts
+	mkdir -p $(ASTVARLIBDIR)/scripts
 	@for x in gui_configs/*; do \
 		echo "$$x  -->  $(ASTETCDIR)" ; \
 		cp $$x $(ASTETCDIR)/ ; \
 	done
 	@for x in scripts/*; do \
-		echo "$$x  -->  $(ASTETCDIR)/scripts" ; \
-		cp $$x $(ASTETCDIR)/scripts ; \
+		echo "$$x  -->  $(ASTVARLIBDIR)/scripts" ; \
+		cp $$x $(ASTVARLIBDIR)/scripts ; \
 	done
 	@for x in config/images/*; do \
 		echo "$$x  -->  $(CONFIGDIR)/images/" ; \

Modified: branches/asterisknow/config/graphs.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/graphs.html?view=diff&rev=803&r1=802&r2=803
==============================================================================
--- branches/asterisknow/config/graphs.html (original)
+++ branches/asterisknow/config/graphs.html Fri Apr 27 16:03:42 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 cpu > /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/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=803&r1=802&r2=803
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Fri Apr 27 16:03:42 2007
@@ -35,6 +35,7 @@
 var asterisk_guiConfigFile = "guipreferences.conf"; // will be created in asterisk_configfolder, if the file does not exist 
 var asterisk_configfolder = "/etc/asterisk/";
 var asterisk_guiListFiles = "sh /etc/asterisk/scripts/listfiles" ;
+var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */
 
 var sortbynames = false;
 var dragdata = new Object;