From 16f47858b20d766d00f6a933c7edfe9b1e495e74 Mon Sep 17 00:00:00 2001
From: Lars Brinkhoff <lars@nocrew.org>
Date: Mon, 10 Apr 2023 12:43:06 +0200
Subject: [PATCH] Exit F40 and MACRO10 more robustly.

Previously, some invocations would exit after seeing the "core used"
message.  This resulted in an error on some machines.  It's safer to
wait for the message, and then exit when seeing the "*" prompt.
---
 build/misc.tcl | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/build/misc.tcl b/build/misc.tcl
index b4e4206d..4bd9ceee 100644
--- a/build/misc.tcl
+++ b/build/misc.tcl
@@ -462,7 +462,8 @@ expect ":KILL"
 respond "*" ":cwd games\r"
 respond "*" ":dec sys:f40\r"
 respond "*" "advent=advent\r"
-respond "CORE USED" "\032"
+expect "CORE USED"
+respond "*" "\032"
 type ":kill\r"
 respond "*" ":dec sys:loader\r"
 respond "*" "advent/g\r"
@@ -478,7 +479,8 @@ respond "*" ":cwd games\r"
 respond "*" ":dec sys:f40\r"
 respond "*" "adv3sr=adv3sr\r"
 respond "*" "adv3sb=adv3sb\r"
-respond "CORE USED" "\032"
+expect "CORE USED"
+respond "*" "\032"
 type ":kill\r"
 respond "*" ":dec sys:loader\r"
 respond "*" "adv3sb\r"
@@ -497,7 +499,8 @@ respond "*" ":cwd games\r"
 respond "*" ":dec sys:f40\r"
 respond "*" "adv4ma=adv4ma\r"
 respond "*" "adv4su=adv4su\r"
-respond "CORE USED" "\032"
+expect "CORE USED"
+respond "*" "\032"
 type ":kill\r"
 respond "*" ":dec sys:loader\r"
 respond "*" "adv4ma\r"
@@ -515,7 +518,8 @@ respond "*" ":kill\r"
 respond "*" ":cwd games\r"
 respond "*" ":dec sys:f40\r"
 respond "*" "trek=trek\r"
-respond "CORE USED" "\032"
+expect "CORE USED"
+respond "*" "\032"
 type ":kill\r"
 respond "*" ":dec sys:loader\r"
 respond "*" "trek\r"
@@ -608,7 +612,7 @@ respond "*" ":dec sys:macro\r"
 respond "*" "macro=macro\r"
 expect "CORE USED"
 respond "*" "\003"
-type ":kill\r"
+respond "*" ":kill\r"
 respond "*" ":dec sys:link\r"
 respond "*" "macro/go\r"
 # Strange error here.  Workaround is to retry.
@@ -624,7 +628,7 @@ respond "*" ":macro\r"
 respond "*" "macro=macro\r"
 expect "CORE USED"
 respond "*" "\003"
-type ":kill\r"
+respond "*" ":kill\r"
 respond "*" ":dec sys:link\r"
 respond "*" "macro/go\r"
 expect "%LNKNED"
@@ -1698,8 +1702,9 @@ expect ":KILL"
 respond "*" ":cwd bbn\r"
 respond "*" ":macro\r"
 respond "*" "logo=logo\r"
-respond "CORE USED" "\032"
-type ":kill\r"
+expect "CORE USED"
+respond "*" "\003"
+respond "*" ":kill\r"
 respond "*" ":dec sys:loader\r"
 respond "*" "logo/g\r"
 respond "EXIT" ":start 45\r"