bkruse: branch aadk r589 - in /branches/aadk: ./ config/scripts/

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

Author: bkruse
Date: Tue Apr  3 16:46:49 2007
New Revision: 589

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=589
Log:
svnmerge didnt go too well.....but the fixes (scripts/gui_sysinfo) was put into here. Supposed to be merged with corresponding version (588)

Modified:
    branches/aadk/   (props changed)
    branches/aadk/Makefile
    branches/aadk/config/scripts/astman.js

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

Modified: branches/aadk/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/Makefile?view=diff&rev=589&r1=588&r2=589
==============================================================================
--- branches/aadk/Makefile (original)
+++ branches/aadk/Makefile Tue Apr  3 16:46:49 2007
@@ -220,6 +220,7 @@
 	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)/ ; \
@@ -245,8 +246,8 @@
 		$(INSTALL) -m 644 $$x $(CONFIGDIR)/ ; \
 	done
 	@for x in scripts/*; do \
-		echo "$$x  -->  $(ASTETCDIR)" ; \
-		$(INSTALL) -m 755 $$x $(ASTETCDIR)/ ; \
+		echo "$$x  -->  $(ASTETCDIR)/scripts" ; \
+		$(INSTALL) -m 755 $$x $(ASTETCDIR)/scripts ; \
 	done
 	@if [ -x /usr/sbin/asterisk-gui-post-install ]; then \
 		/usr/sbin/asterisk-gui-post-install $(DESTDIR) . ; \

Modified: branches/aadk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/scripts/astman.js?view=diff&rev=589&r1=588&r2=589
==============================================================================
--- branches/aadk/config/scripts/astman.js (original)
+++ branches/aadk/config/scripts/astman.js Tue Apr  3 16:46:49 2007
@@ -27,7 +27,7 @@
 var asterisk_guifbt = 3000; // Feedback msg time
 var asterisk_ConfigBkpPath = "/var/lib/asterisk/sounds/backups/" ;
 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" ;