Skip to content
Snippets Groups Projects
Commit 3029ed5f authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Use Archive() instead of executing 'unzip' to get echolist from infopack

Fixes issue #311

Also clarify "Internet e-mail" address (unrelated)
parent 97090d90
No related branches found
No related tags found
No related merge requests found
...@@ -575,8 +575,8 @@ if(!sysop_email) { ...@@ -575,8 +575,8 @@ if(!sysop_email) {
sysop_email = sysop.replace(' ', '.'); sysop_email = sysop.replace(' ', '.');
sysop_email += '@' + system.inet_addr; sysop_email += '@' + system.inet_addr;
} }
while((netaddr_type(sysop_email) != NET_INTERNET || !confirm("Your e-mail address is " + sysop_email)) && !aborted()) while((netaddr_type(sysop_email) != NET_INTERNET || !confirm("Your Internet e-mail address is " + sysop_email)) && !aborted())
sysop_email = prompt("Your e-mail address"); sysop_email = prompt("Your Internet e-mail address");
/* Get/Confirm passwords */ /* Get/Confirm passwords */
while((!link.AreaFixPwd || !confirm("Your AreaFix Password is '" + link.AreaFixPwd + "'")) && !aborted()) while((!link.AreaFixPwd || !confirm("Your AreaFix Password is '" + link.AreaFixPwd + "'")) && !aborted())
...@@ -708,11 +708,8 @@ if(network.echolist ...@@ -708,11 +708,8 @@ if(network.echolist
file.close(); file.close();
// try to extract // try to extract
var prefix = ""; if(Archive(file.name).extract(system.ctrl_dir, echolist_fname) !== 1) {
if(system.platform == "Win32") print("Please extract " + echolist_fname + " from " + file.name + " into " + system.ctrl_dir);
prefix = system.exec_dir;
if (system.exec(prefix + "unzip -CLjo " + file_getname(network.pack) + " " + echolist_fname) !== 0) {
print("Please extract " + network.echolist + " from " + file.name + " into " + system.ctrl_dir);
} }
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment