From e9c2c942ef8004b0c7ebdbe47d0ead7b131729c3 Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sun, 2 Jul 2023 16:43:54 +0200
Subject: [PATCH] Move trunc-ctrl-z.py invocation and cp runcpm.log into
 run-in-runcpm.py

---
 8080/CPM/Makefile                  | 8 ++------
 8080/CPM/emulator/run-in-runcpm.sh | 6 +++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/8080/CPM/Makefile b/8080/CPM/Makefile
index ede32b4..923d236 100644
--- a/8080/CPM/Makefile
+++ b/8080/CPM/Makefile
@@ -16,6 +16,8 @@ clean:
 	rm -rf $(runcpmdir)
 	rm -f msdos
 
+test: logtest.result inctest.log
+
 run-editor: | msdos
 	FORTHPATH="f:\\src;f:\\tests;f:\\msdos" \
 	../../8086/msdos/emulator/run-in-dosbox.sh f:\\msdos\\volks4th.com
@@ -44,9 +46,6 @@ inctest.log: \
 	    "logclose" \
 	    "bye" \
 	    "exit"
-	cp $(runcpmdir)/output.log output.log
-	../../tools/trunc-ctrl-z.py $(runcpmdir)/A/0/LOGFILE.TXT \
-	    $(runcpmdir)/logfile.txt
 	dos2unix -n $(runcpmdir)/logfile.txt $@
 
 logtest.log: \
@@ -61,9 +60,6 @@ logtest.log: \
 	    "logclose" \
 	    "bye" \
 	    "exit"
-	cp $(runcpmdir)/output.log output.log
-	../../tools/trunc-ctrl-z.py $(runcpmdir)/A/0/LOGFILE.TXT \
-	    $(runcpmdir)/logfile.txt
 	dos2unix -n $(runcpmdir)/logfile.txt $@
 
 emu: $(runcpmdir)/RunCPM
diff --git a/8080/CPM/emulator/run-in-runcpm.sh b/8080/CPM/emulator/run-in-runcpm.sh
index 14181e4..f1ba1c0 100755
--- a/8080/CPM/emulator/run-in-runcpm.sh
+++ b/8080/CPM/emulator/run-in-runcpm.sh
@@ -9,7 +9,7 @@ runcpmdir="${basedir}/runcpm"
 runcpm_a0="${runcpmdir}/A/0"
 toolsdir="${basedir}/../../tools"
 
-logfile="${runcpmdir}/output.log"
+logfile="${runcpmdir}/runcpm.log"
 scriptfile="${runcpmdir}/input.script"
 rm -f "${logfile}"
 rm -f "${scriptfile}"
@@ -34,3 +34,7 @@ if [[ -f "${scriptfile}" ]]; then
 else
   "${runcpmdir}/RunCPM" -o "${logfile}"
 fi
+
+cp "${logfile}" runcpm.log
+"${toolsdir}/trunc-ctrl-z.py" "${runcpmdir}/A/0/LOGFILE.TXT" \
+    "${runcpmdir}/logfile.txt"