From 04d98d232f55d95f3aa3a0ab7bdf9ea3bf5ef123 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 26 May 2025 10:18:10 -0700
Subject: [PATCH] Fix Issue 2139 (large parts of Medley tree not showing up in
 files.interlisp.org) and more improvements to files.interlisp.org (#2156)

Here is what this PR does:

Fix Issue 2139: (MAKE-INDEX-HTMLS) was not handling pseudohosts correctly and an errant LI pseudohost was causing MAKE-INDEX-HTMLS to terminate early. Adjusted MAKE-INDEX-HTML so it uses psuedohosts only for the top level directory and everything further down in the tree uses the truenames relative to the top-level pseudohost, Results in a MAKE-INDEX-HTMLS run that works in the presence of random pseudohosts and in a collection of index.html files without difficult to understand and out of context references to pseudohosts.

Remove loadups/build directory from all HCFILES runs (on desktop and via github actions)

Added maiko source code and removed maiko lde executables from HCFILES outputs for github actions - thus adding maiko code and removing maiki executables @ files.interlisp.org.

Fixed scripts/clean_hcfiles.sh so that it actually cleans off all of the index.html files - was missing some.

.github/workflow directory was being left out of HCFILES. Put it back it.
---
 .github/workflows/doHCFILES.yml |   7 +
 internal/MEDLEY-UTILS           | 298 +++++++++++++++++---------------
 internal/MEDLEY-UTILS.DFASL     | Bin 19099 -> 20056 bytes
 scripts/clean_hcfiles.sh        |   4 +-
 scripts/do_hcfiles.sh           |   7 +
 5 files changed, 174 insertions(+), 142 deletions(-)

diff --git a/.github/workflows/doHCFILES.yml b/.github/workflows/doHCFILES.yml
index 20f53da6..2d37f7c0 100644
--- a/.github/workflows/doHCFILES.yml
+++ b/.github/workflows/doHCFILES.yml
@@ -52,6 +52,12 @@ jobs:
       - name: Checkout Medley repo
         uses: actions/checkout@v4
 
+      - name: Checkout maiko
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository_owner }}/maiko
+          path: ./maiko
+
       - name: Checkout notecards
         uses: actions/checkout@v4
         with:
@@ -79,6 +85,7 @@ jobs:
                               --repo ${{ github.repository_owner }}/maiko \
                               --pattern '*-linux.x86_64.tgz'
           tar -xzf /tmp/maiko.tgz
+          touch ./maiko/linux.x86_64/.skip
         env:
           GH_TOKEN: ${{ secrets.MU_TOKEN }}
 
diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS
index 2502fd6b..14fce7b9 100644
--- a/internal/MEDLEY-UTILS
+++ b/internal/MEDLEY-UTILS
@@ -1,12 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "28-Mar-2025 08:53:43" {DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;2
 30243  
+
(FILECREATED "16-May-2025 15:37:36" {DSK}<home>frank>il>qmedley>internal>MEDLEY-UTILS.;8
 31221  
 
-      :EDIT-BY "lmm"
+      :CHANGES-TO (FNS MAKE-INDEX-HTMLS)
 
-      :CHANGES-TO (FNS MAKE-FULLER-DB)
-
-      :PREVIOUS-DATE "14-Jul-2024 12:51:12" {DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;1)
+      :PREVIOUS-DATE "16-May-2025 13:51:08" {DSK}<home>frank>il>qmedley>internal>MEDLEY-UTILS.;7)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
@@ -128,79 +126,89 @@
            "Welcome to Fuller sysout"])
 
 (MAKE-INDEX-HTMLS

-  [LAMBDA (BASE TOP LEVEL)
                                   (* ; "Edited 29-Apr-2024 14:18 by lmm")


+  [LAMBDA (BASE TOP LEVEL ROOT.NAME)
                         (* ; "Edited 29-Apr-2024 14:18 by lmm")


                                                              (* ; "Edited 26-Apr-2024 16:15 by lmm")


                                                              (* ; "Edited 20-Apr-2024 12:34 by lmm")


-                                                             (* ; "Edited 13-Apr-2024 21:18 by lmm")

-    [OR BASE (SETQ BASE (PSEUDOFILENAME (MEDLEYDIR]
+                                                             (* ; "Edited 13-Apr-2024 21:18 by lmm")


+                                                            (* ; " Edited 16-May-2025 13:17 by fgh")

+    [OR BASE (SETQ BASE (TRUEFILENAME (MEDLEYDIR]
     (OR (DIRECTORYNAMEP BASE)
         (ERROR BASE "not a directory name"))
     (OR (AND (NUMBERP LEVEL)
              (IGREATERP LEVEL 0))
         (SETQ LEVEL 1))
-    (LET* ((SUBDIRS NIL)
-           (DEST (PACKFILENAME 'NAME "index" 'EXTENSION "html" 'VERSION NIL 'BODY BASE))
-           (PSEUDOHOST (EQ (NTHCHAR BASE (CL:1- 0))
-                           '}))
-           SLASHED SHORTNAME)
-          (CL:WITH-OPEN-FILE
-           (S DEST :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION :IF-DOES-NOT-EXIST :CREATE)
-           (CL:FORMAT S "<HTML>~%%<HEAD>~%%")
-           (CL:FORMAT S "<TITLE>Index page for ~a</TITLE>~%%" (SETQ SLASHED (SLASHIT BASE)))
-           (CL:FORMAT S "<SCRIPT>~%%")
-           (CL:FORMAT S "    function up_onclick(){~%%")
-           (CL:FORMAT S "        var newLoc = location.href.replace(/\/index.html$/i, %"%");~%%")
-           (CL:FORMAT S "        location = newLoc.replace(/\/[^\/]+\/?$/, %"%");~%%")
-           (CL:FORMAT S "     }~%%")
-           (CL:FORMAT S "</SCRIPT>~%%")
-           (CL:FORMAT S "</HEAD>~%%")
-           (CL:FORMAT S "<BODY><H1>Index page for ~a</H1>~%%" SLASHED)
-           (CL:UNLESS (EQ LEVEL 1)
-                  (CL:FORMAT S 
+    (OR ROOT.NAME (SETQ ROOT.NAME 'MEDLEY))
+    (RESETLST
+        (if
 (EQ LEVEL 1)
+            then
 (RESETSAVE (PSEUDOHOSTS T))
+                 (PSEUDOHOST ROOT.NAME BASE))
+        (SETQ BASE (PSEUDOFILENAME BASE))
+        [LET*
+         ((SUBDIRS NIL)
+          (DEST (PACKFILENAME 'NAME "index" 'EXTENSION "html" 'VERSION NIL 'BODY BASE))
+          (PSEUDOHOST (EQ (NTHCHAR BASE (CL:1- 0))
+                          '}))
+          SLASHED SHORTNAME)
+         (CL:WITH-OPEN-FILE
+          (S DEST :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION :IF-DOES-NOT-EXIST :CREATE)
+          (CL:FORMAT S "<HTML>~%%<HEAD>~%%")
+          (CL:FORMAT S "<TITLE>Index page for ~a</TITLE>~%%" (SETQ SLASHED (SLASHIT BASE)))
+          (CL:FORMAT S "<SCRIPT>~%%")
+          (CL:FORMAT S "    function up_onclick(){~%%")
+          (CL:FORMAT S "        var newLoc = location.href.replace(/\/index.html$/i, %"%");~%%")
+          (CL:FORMAT S "        location = newLoc.replace(/\/[^\/]+\/?$/, %"%");~%%")
+          (CL:FORMAT S "     }~%%")
+          (CL:FORMAT S "</SCRIPT>~%%")
+          (CL:FORMAT S "</HEAD>~%%")
+          (CL:FORMAT S "<BODY><H1>Index page for ~a</H1>~%%" SLASHED)
+          (CL:UNLESS (EQ LEVEL 1)
+                 (CL:FORMAT S 
       "<DIV>~%%<BUTTON TYPE=%"BUTTON%" ONCLICK=%"up_onclick()%">Go up one level</BUTTON>~%%</DIV>~%%"
-                         ))
-           (CL:FORMAT S "<P>This is an index of the files just to link them in.~%%<UL>~%%")
-           (FOR
 FULLNAME IN
 (DIRECTORY (CONCAT BASE "*.*;"))
-              DO
 (IF
 (EQ (NTHCHAR FULLNAME -1)
-                         '>)
-                     THEN
 
-                          (* ;; "A directory")

+                        ))
+          (CL:FORMAT S "<P>This is an index of the files just to link them in.~%%<UL>~%%")
+          (for
 FULLNAME in
 (DIRECTORY (CONCAT BASE "*.*;"))
+             do
 (if
 (EQ (NTHCHAR FULLNAME -1)
+                        '>)
+                    then
 
+                         (* ;; "A directory")

 
-                          (IF
 (NOT (DIRECTORYNAMEP FULLNAME))
-                              THEN
 (HELP "NOT DIRNAME"))
-                          (SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME
-                                                         (+ (NCHARS BASE)
-                                                            (IF
 PSEUDOHOST
-                                                                THEN
 2
-                                                              ELSE
 1))
-                                                         -2)))
-                          (CL:UNLESS (OR (MEMB SHORTNAME '(.git))
-                                         (STRPOS ".git" FULLNAME)
-                                         (INFILEP (CONCAT FULLNAME ".skip")))
+                         (if
 (NOT (DIRECTORYNAMEP FULLNAME))
+                             then
 (HELP (CONCAT "NOT DIRNAME " FULLNAME)))
+                         (SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME
+                                                        (+ (NCHARS BASE)
+                                                           (if
 PSEUDOHOST
+                                                               then
 2
+                                                             else
 1))
+                                                        -2)))
+                         (CL:UNLESS (OR (MEMB SHORTNAME '(.git))
+                                        (MEMB SHORTNAME '(.GIT))
+                                        [AND (STRPOS ".git" (L-CASE FULLNAME))
+                                             (NOT (STRPOS ".github" (L-CASE FULLNAME]
+                                        (INFILEP (CONCAT FULLNAME ".skip")))
 
-                              (* ;; ".skip in the directory itself -- don't index any of it")

+                             (* ;; ".skip in the directory itself -- don't index any of it")

 
-                              (SETQ SUBDIRS (NCONC1 SUBDIRS FULLNAME))
-                              (CL:FORMAT S "<LI><A HREF=%"~a/%">~a/</A></LI>~%%" SHORTNAME SHORTNAME))
-                   ELSEIF
 (MEMB [SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME (ADD1 (NCHARS BASE))
-                                                               (SUB1 (OR (STRPOS ".;" FULLNAME)
-                                                                         (STRPOS ";" FULLNAME)
-                                                                         (HELP 
-                                                                              "No ; in non-directory"
-                                                                               ]
-                                '(index.html .skip))
-                     THEN
 
-                          (* ;; "dont index the index")

+                             (SETQ SUBDIRS (NCONC1 SUBDIRS FULLNAME))
+                             (CL:FORMAT S "<LI><A HREF=%"~a/%">~a/</A></LI>~%%" SHORTNAME SHORTNAME))
+                  elseif
 (MEMB [SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME (ADD1 (NCHARS BASE))
+                                                              (SUB1 (OR (STRPOS ".;" FULLNAME)
+                                                                        (STRPOS ";" FULLNAME)
+                                                                        (HELP (CONCAT 
+                                                                            "No ; in non-directory  "
+                                                                                     FULLNAME]
+                               '(index.html .skip))
+                    then
 
+                         (* ;; "dont index the index")

 
-                   ELSEIF
 (MEMB (FILENAMEFIELD SHORTNAME 'EXTENSION)
-                                '(IMPTR SKIP skip imptr))
-                     THEN
 
-                          (* ;; " don't enuerate ANY.SKIP ANY.IMPTR etc")

+                  elseif
 (MEMB (FILENAMEFIELD SHORTNAME 'EXTENSION)
+                               '(IMPTR SKIP skip imptr))
+                    then
 
+                         (* ;; " don't enuerate ANY.SKIP ANY.IMPTR etc")

 
-                   ELSE
 (CL:FORMAT S "<LI><A HREF=%"~a%">~a</A></LI>~%%" SHORTNAME SHORTNAME)))
-           (CL:FORMAT S "</UL></BODY></HTML>~%%"))
-          (NCONC SUBDIRS (FOR
 D IN
 SUBDIRS join
 (MAKE-INDEX-HTMLS
 D (OR TOP BASE)
-                                                       (ADD1 LEVEL])
+                  else
 (CL:FORMAT S "<LI><A HREF=%"~a%">~a</A></LI>~%%" SHORTNAME SHORTNAME)))
+          (CL:FORMAT S "</UL></BODY></HTML>~%%"))
+         (NCONC SUBDIRS (for
 D in
 SUBDIRS join
 (MAKE-INDEX-HTMLS
 D (OR TOP BASE)
+                                                      (ADD1 LEVEL])])
 
 (MEDLEY-FIX-LINKS

   [LAMBDA (UNIXPATH)
                                       (* ; "Edited 18-Jan-2021 12:01 by larry")

@@ -293,11 +301,11 @@
       (PHASES (OR SUBSETS '(TEDIT PRETTY INDEX HRULE]
      (FILESLOAD PDFSTREAM SKETCH)
      (FONTSET 'STANDARD)
-     (WHILE
 DIRLIST
-        DO

-        (SETQ BASE (POP
 DIRLIST))
-        (FOR
 SRCPATH IN
 (DIRECTORY (CONCAT BASE "*.*;"))
-           DO
 (PROG* [(SRC (UNPACKFILENAME SRCPATH))
+     (while
 DIRLIST
+        do

+        (SETQ BASE (pop
 DIRLIST))
+        (for
 SRCPATH in
 (DIRECTORY (CONCAT BASE "*.*;"))
+           do
 (PROG* [(SRC (UNPACKFILENAME SRCPATH))
                       [EXT (U-CASE (LISTGET SRC 'EXTENSION]
                       (DIR (LISTGET SRC 'DIRECTORY))
                       FRDY LDGP DEST (NOV (PACKFILENAME `(VERSION NIL ,@SRC]
@@ -330,13 +338,13 @@
                      (CL:WHEN (INFILEP (CONCAT DEST ".skip"))
                          (PRINTOUT T "Explicit .skip " DEST T)
                          (RETURN))
-                     (IF
 (MEMB 'TEDIT PHASES)
-                         THEN
 (CL:WHEN [OR (MEMB EXT '(TEDIT TED SKETCH BRAVO))
+                     (if
 (MEMB 'TEDIT PHASES)
+                         then
 (CL:WHEN [OR (MEMB EXT '(TEDIT TED SKETCH BRAVO))
                                            (CAR (NLSETQ (TEDIT.FORMATTEDFILEP SRCPATH]
-                                  (IF
 (EQ REDO 'TEST)
-                                      THEN
 (CL:FORMAT T "Testing open ~a..." SRCPATH)
+                                  (if
 (EQ REDO 'TEST)
+                                      then
 (CL:FORMAT T "Testing open ~a..." SRCPATH)
                                            (CLOSEF? (OPENTEXTSTREAM SRCPATH))
-                                    ELSE
 (OR [NLSETQ (CL:WITH-OPEN-STREAM (S (OPENTEXTSTREAM SRCPATH)
+                                    else
 (OR [NLSETQ (CL:WITH-OPEN-STREAM (S (OPENTEXTSTREAM SRCPATH)
                                                                              )
                                                             (TEDIT.FORMAT.HARDCOPY S DEST T NIL NIL 
                                                                    NIL 'PDF]
@@ -353,79 +361,89 @@
                          (PRINTOUT T "DONE" T))])
 
 (MAKE-INDEX-HTMLS

-  [LAMBDA (BASE TOP LEVEL)
                                   (* ; "Edited 29-Apr-2024 14:18 by lmm")


+  [LAMBDA (BASE TOP LEVEL ROOT.NAME)
                         (* ; "Edited 29-Apr-2024 14:18 by lmm")


                                                              (* ; "Edited 26-Apr-2024 16:15 by lmm")


                                                              (* ; "Edited 20-Apr-2024 12:34 by lmm")


-                                                             (* ; "Edited 13-Apr-2024 21:18 by lmm")

-    [OR BASE (SETQ BASE (PSEUDOFILENAME (MEDLEYDIR]
+                                                             (* ; "Edited 13-Apr-2024 21:18 by lmm")


+                                                            (* ; " Edited 16-May-2025 13:17 by fgh")

+    [OR BASE (SETQ BASE (TRUEFILENAME (MEDLEYDIR]
     (OR (DIRECTORYNAMEP BASE)
         (ERROR BASE "not a directory name"))
     (OR (AND (NUMBERP LEVEL)
              (IGREATERP LEVEL 0))
         (SETQ LEVEL 1))
-    (LET* ((SUBDIRS NIL)
-           (DEST (PACKFILENAME 'NAME "index" 'EXTENSION "html" 'VERSION NIL 'BODY BASE))
-           (PSEUDOHOST (EQ (NTHCHAR BASE (CL:1- 0))
-                           '}))
-           SLASHED SHORTNAME)
-          (CL:WITH-OPEN-FILE
-           (S DEST :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION :IF-DOES-NOT-EXIST :CREATE)
-           (CL:FORMAT S "<HTML>~%%<HEAD>~%%")
-           (CL:FORMAT S "<TITLE>Index page for ~a</TITLE>~%%" (SETQ SLASHED (SLASHIT BASE)))
-           (CL:FORMAT S "<SCRIPT>~%%")
-           (CL:FORMAT S "    function up_onclick(){~%%")
-           (CL:FORMAT S "        var newLoc = location.href.replace(/\/index.html$/i, %"%");~%%")
-           (CL:FORMAT S "        location = newLoc.replace(/\/[^\/]+\/?$/, %"%");~%%")
-           (CL:FORMAT S "     }~%%")
-           (CL:FORMAT S "</SCRIPT>~%%")
-           (CL:FORMAT S "</HEAD>~%%")
-           (CL:FORMAT S "<BODY><H1>Index page for ~a</H1>~%%" SLASHED)
-           (CL:UNLESS (EQ LEVEL 1)
-                  (CL:FORMAT S 
+    (OR ROOT.NAME (SETQ ROOT.NAME 'MEDLEY))
+    (RESETLST
+        (if
 (EQ LEVEL 1)
+            then
 (RESETSAVE (PSEUDOHOSTS T))
+                 (PSEUDOHOST ROOT.NAME BASE))
+        (SETQ BASE (PSEUDOFILENAME BASE))
+        [LET*
+         ((SUBDIRS NIL)
+          (DEST (PACKFILENAME 'NAME "index" 'EXTENSION "html" 'VERSION NIL 'BODY BASE))
+          (PSEUDOHOST (EQ (NTHCHAR BASE (CL:1- 0))
+                          '}))
+          SLASHED SHORTNAME)
+         (CL:WITH-OPEN-FILE
+          (S DEST :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION :IF-DOES-NOT-EXIST :CREATE)
+          (CL:FORMAT S "<HTML>~%%<HEAD>~%%")
+          (CL:FORMAT S "<TITLE>Index page for ~a</TITLE>~%%" (SETQ SLASHED (SLASHIT BASE)))
+          (CL:FORMAT S "<SCRIPT>~%%")
+          (CL:FORMAT S "    function up_onclick(){~%%")
+          (CL:FORMAT S "        var newLoc = location.href.replace(/\/index.html$/i, %"%");~%%")
+          (CL:FORMAT S "        location = newLoc.replace(/\/[^\/]+\/?$/, %"%");~%%")
+          (CL:FORMAT S "     }~%%")
+          (CL:FORMAT S "</SCRIPT>~%%")
+          (CL:FORMAT S "</HEAD>~%%")
+          (CL:FORMAT S "<BODY><H1>Index page for ~a</H1>~%%" SLASHED)
+          (CL:UNLESS (EQ LEVEL 1)
+                 (CL:FORMAT S 
       "<DIV>~%%<BUTTON TYPE=%"BUTTON%" ONCLICK=%"up_onclick()%">Go up one level</BUTTON>~%%</DIV>~%%"
-                         ))
-           (CL:FORMAT S "<P>This is an index of the files just to link them in.~%%<UL>~%%")
-           (FOR
 FULLNAME IN
 (DIRECTORY (CONCAT BASE "*.*;"))
-              DO
 (IF
 (EQ (NTHCHAR FULLNAME -1)
-                         '>)
-                     THEN
 
-                          (* ;; "A directory")

+                        ))
+          (CL:FORMAT S "<P>This is an index of the files just to link them in.~%%<UL>~%%")
+          (for
 FULLNAME in
 (DIRECTORY (CONCAT BASE "*.*;"))
+             do
 (if
 (EQ (NTHCHAR FULLNAME -1)
+                        '>)
+                    then
 
+                         (* ;; "A directory")

 
-                          (IF
 (NOT (DIRECTORYNAMEP FULLNAME))
-                              THEN
 (HELP "NOT DIRNAME"))
-                          (SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME
-                                                         (+ (NCHARS BASE)
-                                                            (IF
 PSEUDOHOST
-                                                                THEN
 2
-                                                              ELSE
 1))
-                                                         -2)))
-                          (CL:UNLESS (OR (MEMB SHORTNAME '(.git))
-                                         (STRPOS ".git" FULLNAME)
-                                         (INFILEP (CONCAT FULLNAME ".skip")))
+                         (if
 (NOT (DIRECTORYNAMEP FULLNAME))
+                             then
 (HELP (CONCAT "NOT DIRNAME " FULLNAME)))
+                         (SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME
+                                                        (+ (NCHARS BASE)
+                                                           (if
 PSEUDOHOST
+                                                               then
 2
+                                                             else
 1))
+                                                        -2)))
+                         (CL:UNLESS (OR (MEMB SHORTNAME '(.git))
+                                        (MEMB SHORTNAME '(.GIT))
+                                        [AND (STRPOS ".git" (L-CASE FULLNAME))
+                                             (NOT (STRPOS ".github" (L-CASE FULLNAME]
+                                        (INFILEP (CONCAT FULLNAME ".skip")))
 
-                              (* ;; ".skip in the directory itself -- don't index any of it")

+                             (* ;; ".skip in the directory itself -- don't index any of it")

 
-                              (SETQ SUBDIRS (NCONC1 SUBDIRS FULLNAME))
-                              (CL:FORMAT S "<LI><A HREF=%"~a/%">~a/</A></LI>~%%" SHORTNAME SHORTNAME))
-                   ELSEIF
 (MEMB [SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME (ADD1 (NCHARS BASE))
-                                                               (SUB1 (OR (STRPOS ".;" FULLNAME)
-                                                                         (STRPOS ";" FULLNAME)
-                                                                         (HELP 
-                                                                              "No ; in non-directory"
-                                                                               ]
-                                '(index.html .skip))
-                     THEN
 
-                          (* ;; "dont index the index")

+                             (SETQ SUBDIRS (NCONC1 SUBDIRS FULLNAME))
+                             (CL:FORMAT S "<LI><A HREF=%"~a/%">~a/</A></LI>~%%" SHORTNAME SHORTNAME))
+                  elseif
 (MEMB [SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME (ADD1 (NCHARS BASE))
+                                                              (SUB1 (OR (STRPOS ".;" FULLNAME)
+                                                                        (STRPOS ";" FULLNAME)
+                                                                        (HELP (CONCAT 
+                                                                            "No ; in non-directory  "
+                                                                                     FULLNAME]
+                               '(index.html .skip))
+                    then
 
+                         (* ;; "dont index the index")

 
-                   ELSEIF
 (MEMB (FILENAMEFIELD SHORTNAME 'EXTENSION)
-                                '(IMPTR SKIP skip imptr))
-                     THEN
 
-                          (* ;; " don't enuerate ANY.SKIP ANY.IMPTR etc")

+                  elseif
 (MEMB (FILENAMEFIELD SHORTNAME 'EXTENSION)
+                               '(IMPTR SKIP skip imptr))
+                    then
 
+                         (* ;; " don't enuerate ANY.SKIP ANY.IMPTR etc")

 
-                   ELSE
 (CL:FORMAT S "<LI><A HREF=%"~a%">~a</A></LI>~%%" SHORTNAME SHORTNAME)))
-           (CL:FORMAT S "</UL></BODY></HTML>~%%"))
-          (NCONC SUBDIRS (FOR
 D IN
 SUBDIRS join
 (MAKE-INDEX-HTMLS
 D (OR TOP BASE)
-                                                       (ADD1 LEVEL])
+                  else
 (CL:FORMAT S "<LI><A HREF=%"~a%">~a</A></LI>~%%" SHORTNAME SHORTNAME)))
+          (CL:FORMAT S "</UL></BODY></HTML>~%%"))
+         (NCONC SUBDIRS (for
 D in
 SUBDIRS join
 (MAKE-INDEX-HTMLS
 D (OR TOP BASE)
+                                                      (ADD1 LEVEL])])
 )
 
 (PUTPROPS MEDLEY-UTILS
 FILETYPE
 :COMPILE-FILE)
@@ -532,9 +550,9 @@
 (ADDTOVAR LAMA
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1104 12495 (GATHER-INFO 1114 . 6496) (MAKE-FULLER-DB 6498 . 7407) (MAKE-INDEX-HTMLS 
-7409 . 11864) (MEDLEY-FIX-LINKS 11866 . 12259) (MEDLEY-FIX-DATES 12261 . 12493)) (13674 16462 (
-MAKE-EXPORTS-ALL 13684 . 14743) (MAKE-WHEREIS-HASH 14745 . 15934) (MAKE-WHEREIS-LOOPS 15936 . 16460)) 
-(16463 25195 (HCFILES 16473 . 20736) (MAKE-INDEX-HTMLS 20738 . 25193)) (25445 30057 (RECOMPILE-ONE 
-25455 . 27352) (RECMPL 27354 . 27957) (COMPILE-SETUP 27959 . 28583) (REMAKEFILES 28585 . 30055)))))
+  (FILEMAP (NIL (1086 12975 (GATHER-INFO 1096 . 6478) (MAKE-FULLER-DB 6480 . 7389) (MAKE-INDEX-HTMLS 
+7391 . 12344) (MEDLEY-FIX-LINKS 12346 . 12739) (MEDLEY-FIX-DATES 12741 . 12973)) (14154 16942 (
+MAKE-EXPORTS-ALL 14164 . 15223) (MAKE-WHEREIS-HASH 15225 . 16414) (MAKE-WHEREIS-LOOPS 16416 . 16940)) 
+(16943 26173 (HCFILES 16953 . 21216) (MAKE-INDEX-HTMLS 21218 . 26171)) (26423 31035 (RECOMPILE-ONE 
+26433 . 28330) (RECMPL 28332 . 28935) (COMPILE-SETUP 28937 . 29561) (REMAKEFILES 29563 . 31033)))))
 STOP
diff --git a/internal/MEDLEY-UTILS.DFASL b/internal/MEDLEY-UTILS.DFASL
index 0b7a1154e23c7e8fc39f6ac6f6ecb2f5b5d20a18..405c8cc7058fad5c7d81206ab4a0a276574ee9a7 100644
GIT binary patch
delta 6202
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

delta 5174
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
Zt|rGSJ|^*XwY{{H|D|@Fvh&WJe*p-XV^RPB

diff --git a/scripts/clean_hcfiles.sh b/scripts/clean_hcfiles.sh
index 9c7f9e3f..d7218cad 100755
--- a/scripts/clean_hcfiles.sh
+++ b/scripts/clean_hcfiles.sh
@@ -23,8 +23,8 @@ main() {
 
     cat >"${shellfile}" <<-'EOF'
 	#!/bin/sh
-	git status --porcelain "$1" | grep --quiet --no-messages "??"
-	if [ $? -eq 0 ]
+	x=$(git ls-files "$1" 2>/dev/null)
+	if [ -z "$x" ]
 	then
 	rm -f "$1"
 	rm -f "$1".~*~
diff --git a/scripts/do_hcfiles.sh b/scripts/do_hcfiles.sh
index 075a9731..0246a0db 100755
--- a/scripts/do_hcfiles.sh
+++ b/scripts/do_hcfiles.sh
@@ -38,6 +38,13 @@ main() {
 	"
 	EOF
 
+        # Make sure loadups/build is not included in HCFILES
+        if [ -d "${MEDLEYDIR}/loadups/build" ]
+        then
+          touch "${MEDLEYDIR}/loadups/build/.skip"
+        fi
+
+
         /bin/sh "${MEDLEYDIR}/scripts/medley/medley.command"     \
              --config -                                          \
              --id hcfiles_+                                      \