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

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

Author: bkruse
Date: Tue Apr  3 16:54:30 2007
New Revision: 590

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

........
r588 | bkruse | 2007-04-03 16:34:14 -0500 (Tue, 03 Apr 2007) | 1 line

moved gui_sysinfo into the scripts/ directory in the source and in /etc/asterisk. Also updated that change in astman.js
........


Added:
    branches/asterisknow/scripts/
      - copied from r588, trunk/scripts/
    branches/asterisknow/scripts/gui_sysinfo
      - copied unchanged from r588, trunk/scripts/gui_sysinfo
Removed:
    branches/asterisknow/gui_configs/gui_sysinfo
Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/Makefile
    branches/asterisknow/config/scripts/astman.js

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr  3 16:54:30 2007
@@ -1,1 +1,1 @@
-/trunk:1-448,501-505,507,511-512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570,572
+/trunk:1-448,501-505,507,511-512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570,572,588

Modified: branches/asterisknow/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/Makefile?view=diff&rev=590&r1=589&r2=590
==============================================================================
--- branches/asterisknow/Makefile (original)
+++ branches/asterisknow/Makefile Tue Apr  3 16:54:30 2007
@@ -198,9 +198,14 @@
 	mkdir -p $(CONFIGDIR)/stylesheets
 	mkdir -p $(CONFIGDIR)/bkps
 	mkdir -p $(CONFIGDIR)/setup
+	mkdir -p $(ASTETCDIR)/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 ; \
 	done
 	@for x in config/images/*; do \
 		echo "$$x  -->  $(CONFIGDIR)/images/" ; \

Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=590&r1=589&r2=590
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Tue Apr  3 16:54:30 2007
@@ -27,7 +27,7 @@
 var asterisk_guifbt = 3000; // Feedback msg time
 var asterisk_ConfigBkpPath = "/var/lib/asterisk/gui_configbackups/" ;
 var asterisk_menusRecord_path = "/var/lib/asterisk/sounds/record/";
-var asterisk_guiSysInfo = "sh /etc/asterisk/gui_sysinfo" ;
+var asterisk_guiSysInfo = "sh /etc/asterisk/scripts/gui_sysinfo" ;
 var asterisk_guiSysInfo_output = "./sysinfo_output.html";
 var asterisk_guiZapscan = "/sbin/zapscan.bin" ;
 var asterisk_rawmanPath = "../../rawman" ;
@@ -1844,4 +1844,4 @@
 	}
 }
 
-astmanEngine = new Astman();
+astmanEngine = new Astman();