bkruse: branch asterisknow r1515 - in /branches/asterisknow: ./ config/ confi...

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Tue Sep  4 15:42:11 2007
New Revision: 1515

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1515
Log:
Merged revisions 1513 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1513 | bkruse | 2007-09-04 15:40:38 -0500 (Tue, 04 Sep 2007) | 12 lines

Fixed the Makefile hacked introduced in rev 659 by me.
Now does things correctly, and uses ASTSBINDIR.
(which typically is /usr/sbin/)
Updated astman.js to not statically call
/sbin/[ztscan, zapscan]
but rather just let the system find the binaries
in the $PATH.
(closes issue #10581)
Also changed the way digital.html parsed ztscan.conf, so
it will not alert you the first time you see the page or
run the tool.

........

Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/digital.html
    branches/asterisknow/config/scripts/astman.js
    branches/asterisknow/tools/Makefile

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep  4 15:42:11 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1296,1316,1326,1332,1336-1338,1342,1346,1356,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439,1442,1455,1465,1475,1478,1481,1488,1491,1494,1497,1500,1504,1507,1510
+/branches/1.4:1-1296,1316,1326,1332,1336-1338,1342,1346,1356,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439,1442,1455,1465,1475,1478,1481,1488,1491,1494,1497,1500,1504,1507,1510,1513

Modified: branches/asterisknow/config/digital.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/digital.html?view=diff&rev=1515&r1=1514&r2=1515
==============================================================================
--- branches/asterisknow/config/digital.html (original)
+++ branches/asterisknow/config/digital.html Tue Sep  4 15:42:11 2007
@@ -452,10 +452,13 @@
 
 function load_config_tool() { 
 	if(!config2json("ztscan.conf", 1, digitalparse)) {
-		alert("Have you properly installed ztscan to /sbin/ztscan?\n/etc/asterisk/ztscan.conf does not exist.");
+		alert("Have you properly installed ztscan?\n/etc/asterisk/ztscan.conf does not exist.");
 		_$('error_txt').style.display="";
 		_$('error_txt').innerHTML="<br><br>Problem Detecting/No Cards(or spans) Found!<br><br>  Error: No Config File";		
 		_$('tablecontainer').style.display="none";
+	} else {
+		/* Our config file was found....we can parse the options into widgets and _$('devices') */
+		parent.astmanEngine.config2list("ztscan.conf", _$('devices'), widgets, zt_cb);
 	}
 }
 
@@ -466,7 +469,6 @@
 	setTimeout("_$('status_message').style.display='none'", 5000);
 	_$('message_text').innerHTML = "Detecting Digital Cards ... (Beta)";
 	setWindowTitle("Digital Setup Wizard");
-	parent.astmanEngine.config2list("ztscan.conf", _$('devices'), widgets, zt_cb);
 	parent.loadscreen(this);
 	/* Give ztscan 4 seconds to detect and write to ztscan.conf */
 	parent.astmanEngine.run_tool(asterisk_guiZtscan, function(t) {

Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=1515&r1=1514&r2=1515
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Tue Sep  4 15:42:11 2007
@@ -32,8 +32,8 @@
 var asterisk_menusRecord_path = asterisk_Sounds_path + "record/";
 var asterisk_guiSysInfo = "sh " + asterisk_scriptsFolder + "gui_sysinfo" ;
 var asterisk_guiSysInfo_output = "./sysinfo_output.html";
-var asterisk_guiZapscan = "/sbin/zapscan.bin" ;
-var asterisk_guiZtscan = "/sbin/ztscan";
+var asterisk_guiZapscan = "zapscan.bin" ;
+var asterisk_guiZtscan = "ztscan";
 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/";

Modified: branches/asterisknow/tools/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/tools/Makefile?view=diff&rev=1515&r1=1514&r2=1515
==============================================================================
--- branches/asterisknow/tools/Makefile (original)
+++ branches/asterisknow/tools/Makefile Tue Sep  4 15:42:11 2007
@@ -33,10 +33,7 @@
 ifeq ($(PBX_ZAPTEL),1)
 	mkdir -p $(ASTSBINDIR)
 	$(INSTALL) -m 755 zapscan.bin $(ASTSBINDIR)
-	$(INSTALL) -m 755 zapscan.bin /sbin
 	$(INSTALL) -m 755 zapscan $(ASTSBINDIR)
-	$(INSTALL) -m 755 zapscan /sbin	
-	$(INSTALL) -m 755 ztscan /sbin	
 	$(INSTALL) -m 755 ztscan $(ASTSBINDIR)
 	
 endif