From 1d8685e6cb211ebb83a34b080c63b3bfa5a4d777 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 19 Mar 2025 11:11:16 -0700
Subject: [PATCH] Fix issue #2072 (doHCFILES.yml fails).  Also fix unrelated
 bug in buildReleaseInclDocker.yml workflow that was causing build failure.
 (#2074)

* Fix Issue 2072: update do_hcfiles.sh to use new rem.cm argument to medley script.  Also update medley script to print out the REM.CM file used (if any).
* Update buildReleaseIncDocker.yml to account for the change on interlisp/online repo from 'master' to 'main' as primary branch
* Do compile.sh after update to medley-run.sh to add REM.CM to printout when using the medley command.
---
 .github/workflows/buildReleaseInclDocker.yml | 2 +-
 scripts/do_hcfiles.sh                        | 3 ++-
 scripts/medley/medley.command                | 1 +
 scripts/medley/medley_run.sh                 | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 335b9a82..08118c4c 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -131,7 +131,7 @@ jobs:
         run: |
           if [ ! "${{ needs.inputs.outputs.draft }}" = "true" ]
           then
-            gh workflow run buildAndDeployMedleyDocker.yml --repo Interlisp/online --ref master
+            gh workflow run buildAndDeployMedleyDocker.yml --repo Interlisp/online --ref main
           fi
         env:
           GITHUB_TOKEN: ${{ secrets.ONLINE_TOKEN }}
diff --git a/scripts/do_hcfiles.sh b/scripts/do_hcfiles.sh
index 83a995a0..075a9731 100755
--- a/scripts/do_hcfiles.sh
+++ b/scripts/do_hcfiles.sh
@@ -44,7 +44,8 @@ main() {
              --geometry 1024x768                                 \
              --noscroll                                          \
              --logindir "${logindir}"                            \
-             --greet "${cmfile}"                                 \
+             --greet -                                           \
+             --rem.cm "${cmfile}"                                \
              --apps
 
         # save dribble file to loadups; extract and save fails
diff --git a/scripts/medley/medley.command b/scripts/medley/medley.command
index 7b85644b..bb8d6f42 100755
--- a/scripts/medley/medley.command
+++ b/scripts/medley/medley.command
@@ -1412,6 +1412,7 @@ start_maiko() {
   echo "MEDLEYDIR: \"${MEDLEYDIR}\""
   echo "LOGINDIR: \"${LOGINDIR}\""
   echo "GREET FILE: \"${LDEINIT}\""
+  echo "REM.CM FILE: \"${LDEREMCM}\""
   echo "VMEM FILE: \"${LDEDESTSYSOUT}\""
   #
   # Temp workaround for issues in Maiko sysout arg
diff --git a/scripts/medley/medley_run.sh b/scripts/medley/medley_run.sh
index 6947aa90..6d3e0cc6 100644
--- a/scripts/medley/medley_run.sh
+++ b/scripts/medley/medley_run.sh
@@ -293,6 +293,7 @@ start_maiko() {
   echo "MEDLEYDIR: \"${MEDLEYDIR}\""
   echo "LOGINDIR: \"${LOGINDIR}\""
   echo "GREET FILE: \"${LDEINIT}\""
+  echo "REM.CM FILE: \"${LDEREMCM}\""
   echo "VMEM FILE: \"${LDEDESTSYSOUT}\""
   #
   # Temp workaround for issues in Maiko sysout arg