From 1765f7da8d1d3d5c4cf76f6ccef167a1c4af0931 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Mon, 18 Jan 2016 08:17:48 +0000
Subject: [PATCH] More fixes: - Bool option conversion (e.g.
 nocircularfwd->fwd_circular) didn't work. - Log flags needs 0x prefix -
 Missing ELIST_ONLY -> add_from_echolists_only bool conversion.

---
 exec/sbbsecho_upgrade.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/exec/sbbsecho_upgrade.js b/exec/sbbsecho_upgrade.js
index eed81a0e54..9adc167545 100644
--- a/exec/sbbsecho_upgrade.js
+++ b/exec/sbbsecho_upgrade.js
@@ -42,7 +42,7 @@ for(line_num in cfg) {
 					value_opts[key] = word[1];
 					break;
 				case 1:
-					bool_opts.push(key);
+					bool_opts[key] = true;
 					break;
 				default:
 					alert("Unrecognized cfg line: " + line);
@@ -103,7 +103,7 @@ for(line_num in cfg) {
 
 if (debug) {
 	for(var i in bool_opts)
-		print("bool " + bool_opts[i]);
+		print("bool " + i);
 
 	for(var i in value_opts)
 		print("value " + i + " = " + value_opts[i]);
@@ -133,14 +133,17 @@ if(!file.open("w")) {
 file.writeln("check_path = " + !Boolean(bool_opts["nopathcheck"])), delete bool_opts["nopathcheck"];
 file.writeln("fwd_circular = " + !Boolean(bool_opts["nocircularfwd"])), delete bool_opts["nocircularfwd"];
 file.writeln("kill_empty_netmail = " + Boolean(bool_opts["kill_empty"])), delete bool_opts["kill_empty"];
+file.writeln("add_from_echolists_only = " + Boolean(bool_opts["elist_only"])), delete bool_opts["elist_only"];
 for(var i in bool_opts)
-	file.writeln(bool_opts[i] + " = true");
+	if(i) file.writeln(i + " = true");
+file.writeln();
 file.writeln("notify_user = " + parseInt(value_opts["notify"])), delete value_opts["notify"];
 file.writeln("zone_blind = " + Boolean(value_opts["zone_blind"]));
 if(parseInt(value_opts["zone_blind"]))
 	file.writeln("zone_blind_threshold = " + parseInt(value_opts["zone_blind"])), delete value_opts["zone_blind"];
+file.writeln("log = 0x" + value_opts["log"]), delete value_opts["log"];
 for(var i in value_opts)
-	file.writeln(i + " = " + value_opts[i]);
+	if(i) file.writeln(i + " = " + value_opts[i]);
 
 for(var i in nodelist) {
 	file.writeln();
-- 
GitLab