Fix issues with NOTECARDSDIRECTORIES in apps.sysout base; cleanup stuff made obsolete by apps.sysout move

.github/workflows/buildMedleyDocker.yml

@@ -101,8 +101,6 @@ jobs:
         if: steps.cache-lfs.outputs.cache-hit == 'true'
         run: |
             mv ../save_docker_medley/filebrowser/filebrowser docker_medley/filebrowser/filebrowser
-            mv ../save_docker_medley/gh/gh_2.14.7_linux_amd64.deb docker_medley/gh/gh_2.14.7_linux_amd64.deb
-            mv ../save_docker_medley/gh/gh_2.14.7_linux_arm64.deb docker_medley/gh/gh_2.14.7_linux_arm64.deb
             rm -rf ../save_docker_medley
 
       # Setup release tag
@@ -176,22 +174,6 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@master
 
-      # Online now uses github container registry instead of dockerhub
-      # Login into DockerHub - required to store the created image
-      #- name: Login to DockerHub
-      #  uses: docker/login-action@v1
-      #  with:
-      #    username: ${{ secrets.DOCKER_USERNAME }}
-      #    password: ${{ secrets.DOCKER_PASSWORD }}
-      #
-      #    workflow_call: secrets:
-      #      DOCKER_USERNAME:
-      #        required: true
-      #      DOCKER_PASSWORD:
-      #       required: true
-      #
-
-
       # Login to ghcr.io
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3 

docker_medley/Dockerfile_medley

@@ -65,16 +65,6 @@ RUN apt-get update \
     && apt-get install -y git \
     && apt-get install -y gh
 
-# install tigervnc server
-#RUN apt-get purge -y tightvncserver \
-#    && apt-get install -y tigervnc-standalone-server
-
-# install gh (github cli)
-#COPY gh/gh_2.14.7_linux_*.deb /tmp
-#RUN dpkg -i /tmp/gh_2.14.7_linux_${PLATFORM}.deb; rm /tmp/gh_2.14.7_linux_*.deb
-
-
-
 #  install websockify for use with noVNC
 RUN apt-get install -y websockify
 
@@ -131,21 +121,6 @@ COPY --chown=${USER_NAME}:${USER_NAME} init/ONLINE-INIT.LCOM ${MEDLEY_INSTALLDIR
 COPY notecards ${NC_INSTALLDIR}
 RUN echo ${NOTECARDS_RELEASE} ${NC_INSTALLDIR}/release.txt
 
-# do a loadup to create the online.sysout with Notecards, Rooms, etc installed
-#ARG ONLINE_DIR=${MEDLEY_INSTALLDIR}/../online
-#RUN mkdir -p ${ONLINE_DIR}/docker_medley/loadup \
-#    && chown root:root ${ONLINE_DIR} \
-#    && chown root:root ${ONLINE_DIR}/docker_medley \
-#    && chown root:root ${ONLINE_DIR}/docker_medley/loadup
-#COPY --chown=${USER_NAME}:${USER_NAME} loadup/* ${ONLINE_DIR}/docker_medley/loadup
-#
-#RUN Xvnc -geometry 1280x720 :0 \
-#    &  export DISPLAY=":0" \
-#    && PATH="$MAIKO_INSTALLDIR:$PATH" \
-#    && ${ONLINE_DIR}/docker_medley/loadup/loadup-online-from-full.sh \
-#    && cp -p ${MEDLEY_INSTALLDIR}/tmp/online.sysout ${MEDLEY_INSTALLDIR}/loadups/full.sysout \
-#    && rm -rf ${ONLINE_DIR}/docker_medley/loadup    
-
 # clean up medley/.bashrc for use with xterm
 RUN sed -i /PS1=/s/[email protected]/u@oio/ ${HOMEDIR}/.bashrc \
     && chown ${USER_NAME}:${USER_NAME} ${HOMEDIR}/.bashrc
@@ -167,9 +142,4 @@ WORKDIR ${HOMEDIR}
 USER root:root
 ENTRYPOINT USER=${USER_NAME} /bin/bash
 
-# temp patch 2022-10-12
-# COPY HELPSYS fixes into lispusers
-#COPY --chown=${USER_NAME}:${USER_NAME} misc/HELPSYS ${MEDLEY_INSTALLDIR}/lispusers/HELPSYS
-#COPY --chown=${USER_NAME}:${USER_NAME} misc/HELPSYS.LCOM ${MEDLEY_INSTALLDIR}/lispusers/HELPSYS.LCOM
-
 

docker_medley/init/ONLINE-INIT

@@ -1,13 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "24-Feb-2024 22:33:57" {DSK}<home>medley>il>ONLINE-INIT.;13
 5796   
+
(FILECREATED "25-Feb-2024 11:38:10" {DSK}<home>medley>il>ONLINE-INIT.;15
 7712   
 
       :EDIT-BY "fgh"
 
-      :CHANGES-TO (VARS ONLINE-INITCOMS)
-                  (FNS Online.DoInit ONLINEP)
+      :CHANGES-TO (FNS Online.DoInit)
 
-      :PREVIOUS-DATE "24-Feb-2024 17:17:30" {DSK}<home>medley>il>ONLINE-INIT.;12)
+      :PREVIOUS-DATE "25-Feb-2024 11:21:27" {DSK}<home>medley>il>ONLINE-INIT.;14)
 
 
 (PRETTYCOMPRINT ONLINE-INITCOMS)
@@ -19,11 +18,12 @@
                VTCHAT)
         (GLOBALVARS Online.LogoutTimeout Online.SftpPort Online.SftpPassword Online.SftpDisplay 
                IDLE.PROFILE IDLE.BOUNCING.BOX Online.SftpDisplayMenu ONLINEP ShellBrowser ShellOpener
-               CLHS.OPENER)
+               CLHS.OPENER MEDLEYDIR)
         (INITVARS (Online.LogoutTimeout 30)
                (ONLINEP NIL))
         (ADVISE (SAVEVM :IN \IDLER))
-        (FNS Online.SftpInitInfo Online.SftpUpdateInfo Online.DoInit ONLINEP)
+        (FNS Online.SftpInitInfo Online.SftpUpdateInfo Online.SetUpNOTECARDSDIRECTORIES Online.DoInit
+             ONLINEP)
         (DECLARE%: DONTEVAL@LOAD DOCOPY (P (Online.DoInit)))
         (DECLARE%: FIRST DONTEVAL@LOAD DOCOPY (P (BKSYSBUF " "])
 
@@ -35,7 +35,8 @@
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS Online.LogoutTimeout Online.SftpPort Online.SftpPassword Online.SftpDisplay IDLE.PROFILE
-       IDLE.BOUNCING.BOX Online.SftpDisplayMenu ONLINEP ShellBrowser ShellOpener CLHS.OPENER)
+       IDLE.BOUNCING.BOX Online.SftpDisplayMenu ONLINEP ShellBrowser ShellOpener CLHS.OPENER 
+       MEDLEYDIR)
 )
 
 (RPAQ? Online.LogoutTimeout
 30)
@@ -72,10 +73,39 @@
             (EQ WHEN 'AFTERSAVEVM))
         (Online.SftpInitInfo
])
 
+(Online.SetUpNOTECARDSDIRECTORIES

+  [LAMBDA NIL
                                                (* ; "Edited 25-Feb-2024 11:20 by fgh")

+
+    (* ;; "Find the location of the Notecards directory and call NC.SetUpNOTECARDSDIRECTORIES.")

+
+    (* ;; " This is needed to make sure that lazy loading of Notecard types works.")

+
+    (* ;; " This function should actually be defined and called  in APPS-INIT.  But until it is")

+
+    (* ;; " we'll include and call it here in ONLIONE-INIT.  No harm in calling it twice when")

+
+    (* ;; " it eventually gets integrated into APPS-INIT.")

+
                                                             (* ; "Edited 25-Feb-2024 11:15 by fgh")

+    (LET* [(LOC1 (CONCAT MEDLEYDIR "notecards>"))
+           (LOC2 (CONCAT MEDLEYDIR "..>notecards>"))
+           (LOC3 (CONCAT MEDLEYDIR "..>..>notecards>"))
+           (NCDIR (for
 LOC in
 (LIST LOC1 LOC2 LOC3) thereis
 (OR (INFILEP (CONCAT LOC 
+                                                                                "system>NOTECARDS"))
+                                                                (INFILEP (CONCAT LOC 
+                                                                              "system>NOTECARDS.LCOM"
+                                                                                ]
+          (if
 NCDIR
+              then
 (NC.SetUpNOTECARDSDIRECTORIES NCDIR)
+                   T
+            else
 (PRIN1 "Warning: Notecards directory could not be found." T)
+                 (PRIN1 "Hence, NOTECARDSDIRECTORIES is probably not set correctly" T)
+                 (PRIN1 "and Notecards will not work properly." T)
+                 NIL])
+
 (Online.DoInit

   [LAMBDA NIL
 
-    (* ;; "Edited 24-Feb-2024 22:29 by fgh")

+    (* ;; "Edited 25-Feb-2024 11:37 by fgh")

 
     (* ;; "Edited 24-Feb-2024 00:26 by runner")

 
@@ -139,7 +169,12 @@
            (* ;; "Reset Chat displaytype to enable vt100")

 
            (RPLACA (CAR CHAT.DISPLAYTYPES)
-                  NIL])
+                  NIL)
+
+           (* ;; 
+
 "Setup NOTECARDSDIRECTORIES.  Should be done it APPS-INIT.  But until thats done, we'll do it here.")

+
+           (Online.SetUpNOTECARDSDIRECTORIES
])
 
 (ONLINEP

   [LAMBDA NIL
                                                (* ; "Edited 24-Feb-2024 22:31 by fgh")

@@ -154,6 +189,6 @@
 (BKSYSBUF " ")
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1635 5660 (Online.SftpInitInfo 1645 . 2518) (Online.SftpUpdateInfo 2520 . 2775) (
-Online.DoInit 2777 . 5521) (ONLINEP 5523 . 5658)))))
+  (FILEMAP (NIL (1660 7576 (Online.SftpInitInfo 1670 . 2543) (Online.SftpUpdateInfo 2545 . 2800) (
+Online.SetUpNOTECARDSDIRECTORIES 2802 . 4510) (Online.DoInit 4512 . 7437) (ONLINEP 7439 . 7574)))))
 STOP