bkruse: branch aadk r808 - in /branches/aadk: ./ config/scripts/astman.js

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

Author: bkruse
Date: Fri Apr 27 16:33:59 2007
New Revision: 808

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

........
r804 | bkruse | 2007-04-27 16:10:03 -0500 (Fri, 27 Apr 2007) | 1 line

Updated the other paths to reflect /var/lib/asterisk/scripts instead of /etc/asterisk/scripts directory
........
r805 | bkruse | 2007-04-27 16:15:10 -0500 (Fri, 27 Apr 2007) | 1 line

Another update to adding the scripts in /var/lib/asterisk/scripts instead of /etc/asterisk or /etc/asterisk/scripts
........
r806 | bkruse | 2007-04-27 16:17:38 -0500 (Fri, 27 Apr 2007) | 1 line

gui_configs != gui_scripts, moving it back to /etc/asterisk
........
r807 | bkruse | 2007-04-27 16:22:14 -0500 (Fri, 27 Apr 2007) | 1 line

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:
    branches/aadk/   (props changed)
    branches/aadk/config/scripts/astman.js

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 27 16:33:59 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-801
+/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-807

Modified: branches/aadk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/scripts/astman.js?view=diff&rev=808&r1=807&r2=808
==============================================================================
--- branches/aadk/config/scripts/astman.js (original)
+++ branches/aadk/config/scripts/astman.js Fri Apr 27 16:33:59 2007
@@ -26,19 +26,20 @@
 var asterisk_guiversion = "$Revision$";
 var asterisk_guifbt = 3000; // Feedback msg time
 var asterisk_ConfigBkpPath = "/var/lib/asterisk/sounds/backups/" ;
+var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */
 var asterisk_Sounds_path = "/var/lib/asterisk/sounds/";
 var asterisk_menusRecord_path = asterisk_Sounds_path + "record/";
-var asterisk_guiSysInfo = "sh /etc/asterisk/scripts/gui_sysinfo" ;
+var asterisk_guiSysInfo = "sh " + asterisk_scriptsFolder + "gui_sysinfo" ;
 var asterisk_guiSysInfo_output = "./sysinfo_output.html";
-var asterisk_guiNetworkSettings = "sh /etc/asterisk/scripts/networking.sh";
+var asterisk_guiNetworkSettings = "sh " + asterisk_scriptsFolder + "networking.sh";
 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 /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 asterisk_guiListFiles = "sh " + asterisk_scriptsFolder + "listfiles" ;
 
 var sortbynames = false;
 var dragdata = new Object;