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

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

Author: bkruse
Date: Fri Apr 27 16:22:14 2007
New Revision: 807

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=807
Log:
Final changes for the conversion from /etc/asterisk/scripts to /var/lib/asterisk/scripts. Changed a couple variables to make things have easier readability and easier to include in other functions

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

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-gui/trunk/Makefile?view=diff&rev=807&r1=806&r2=807
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Apr 27 16:22:14 2007
@@ -212,7 +212,7 @@
 	mkdir -p $(ASTVARLIBDIR)/scripts
 	@for x in gui_configs/*; do \
 		echo "$$x  -->  $(ASTETCDIR)" ; \
-		cp $$x $(ASTETCDIR) ; \
+		cp $$x $(ASTETCDIR)/ ; \
 	done
 	@for x in scripts/*; do \
 		echo "$$x  -->  $(ASTVARLIBDIR)/scripts" ; \

Modified: trunk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/astman.js?view=diff&rev=807&r1=806&r2=807
==============================================================================
--- trunk/config/scripts/astman.js (original)
+++ trunk/config/scripts/astman.js Fri Apr 27 16:22:14 2007
@@ -25,17 +25,17 @@
 var asterisk_guitoolsversion = "0.7";
 var asterisk_guiversion = "$Revision$";
 var asterisk_guifbt = 3000; // Feedback msg time
+var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */
 var asterisk_ConfigBkpPath = "/var/lib/asterisk/gui_configbackups/" ;
 var asterisk_Sounds_path = "/var/lib/asterisk/sounds/";
 var asterisk_menusRecord_path = asterisk_Sounds_path + "record/";
-var asterisk_guiSysInfo = "sh /var/lib/asterisk/scripts/gui_sysinfo" ;
+var asterisk_guiSysInfo = "sh " + asterisk_scriptsFolder + "gui_sysinfo" ;
 var asterisk_guiSysInfo_output = "./sysinfo_output.html";
 var asterisk_guiZapscan = "/sbin/zapscan.bin" ;
 var asterisk_rawmanPath = "../../rawman" ;
 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 /var/lib/asterisk/scripts/listfiles" ;
-var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */
+var asterisk_guiListFiles = "sh " + asterisk_scriptsFolder + "listfiles" ;
 
 var sortbynames = false;
 var dragdata = new Object;