bkruse: branch asterisknow r814 - in /branches/asterisknow: ./ config/scripts...

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

Author: bkruse
Date: Fri Apr 27 17:17:52 2007
New Revision: 814

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=814
Log:
Merged revisions 804-807,811 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
........
r811 | bkruse | 2007-04-27 17:08:53 -0500 (Fri, 27 Apr 2007) | 1 line

fixed output path to reflect new script changes
........

Removed:
    branches/asterisknow/scripts/output_path
Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/scripts/astman.js
    branches/asterisknow/scripts/gui_sysinfo
    branches/asterisknow/scripts/listfiles

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

Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=814&r1=813&r2=814
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Fri Apr 27 17:17:52 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 /etc/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 /etc/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;

Modified: branches/asterisknow/scripts/gui_sysinfo
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/scripts/gui_sysinfo?view=diff&rev=814&r1=813&r2=814
==============================================================================
--- branches/asterisknow/scripts/gui_sysinfo (original)
+++ branches/asterisknow/scripts/gui_sysinfo Fri Apr 27 17:17:52 2007
@@ -1,5 +1,6 @@
 #!/bin/sh
-. /etc/asterisk/scripts/output_path
+SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
+
 #SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
 
 UNAME="`uname -a`"

Modified: branches/asterisknow/scripts/listfiles
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/scripts/listfiles?view=diff&rev=814&r1=813&r2=814
==============================================================================
--- branches/asterisknow/scripts/listfiles (original)
+++ branches/asterisknow/scripts/listfiles Fri Apr 27 17:17:52 2007
@@ -1,5 +1,5 @@
 #!/bin/sh
-. /etc/asterisk/scripts/output_path
+SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
 
 /bin/echo "<div id=list_files>" > $SYSINFO_OUTPUT
 /bin/mkdir -p $1