qwell: branch aadk r581 - in /branches/aadk: ./ config/ config/scripts/ scripts/

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

Author: qwell
Date: Tue Apr  3 12:46:30 2007
New Revision: 581

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=581
Log:
Move gui_sysinfo to scripts/ dir from config/ dir
Fix permissions for installed scripts.
Don't try to build tools/ dir on aadk - it has it's own version of zapscan.

Added:
    branches/aadk/scripts/gui_sysinfo
      - copied unchanged from r580, branches/aadk/config/gui_sysinfo
Removed:
    branches/aadk/config/gui_sysinfo
Modified:
    branches/aadk/Makefile
    branches/aadk/config/scripts/astman.js

Modified: branches/aadk/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/Makefile?view=diff&rev=581&r1=580&r2=581
==============================================================================
--- branches/aadk/Makefile (original)
+++ branches/aadk/Makefile Tue Apr  3 12:46:30 2007
@@ -98,7 +98,7 @@
 HTTPSETUPURL:=http://$(HTTPHOST):$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/setup/install.html
 HTTPLOCALURL:=http://localhost:$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/setup/install.html
 
-SUBDIRS:=tools
+#SUBDIRS:=tools
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 
@@ -246,7 +246,7 @@
 	done
 	@for x in scripts/*; do \
 		echo "$$x  -->  $(ASTETCDIR)" ; \
-		$(INSTALL) -m 644 $$x $(ASTETCDIR)/ ; \
+		$(INSTALL) -m 755 $$x $(ASTETCDIR)/ ; \
 	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=581&r1=580&r2=581
==============================================================================
--- branches/aadk/config/scripts/astman.js (original)
+++ branches/aadk/config/scripts/astman.js Tue Apr  3 12:46:30 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 /bin/gui_sysinfo" ;
+var asterisk_guiSysInfo = "sh /etc/asterisk/gui_sysinfo" ;
 var asterisk_guiSysInfo_output = "./sysinfo_output.html";
 var asterisk_guiZapscan = "/sbin/zapscan.bin" ;
 var asterisk_rawmanPath = "../../rawman" ;