diff --git a/docker_medley/Dockerfile_medley b/docker_medley/Dockerfile_medley index 4c5ed69..3a1c0a5 100644 --- a/docker_medley/Dockerfile_medley +++ b/docker_medley/Dockerfile_medley @@ -115,7 +115,7 @@ RUN mkdir -p ${ONLINE_BINDIR} \ && chown root:root ${ONLINE_BINDIR} COPY scripts/* ${ONLINE_BINDIR} RUN chmod ugo+x ${ONLINE_BINDIR}/* \ - && ln -s ${ONLINE_BINDIR}/request_new_tab.sh ${ONLINE_BINDIR}/request_new_tab + && ln -s ${ONLINE_BINDIR}/request-new-tab.sh ${ONLINE_BINDIR}/request-new-tab # copy online-specific files into medley/library COPY --chown=${USER_NAME}:${USER_NAME} library/ONLINEUTILS ${MEDLEY_INSTALLDIR}/library diff --git a/docker_medley/init/ONLINE-INIT b/docker_medley/init/ONLINE-INIT index dd1187c..8228627 100644 --- a/docker_medley/init/ONLINE-INIT +++ b/docker_medley/init/ONLINE-INIT @@ -1,13 +1,14 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 8-Jun-2026 13:13:01" {DSK}frank>il>online>docker¬medley>init>ONLINE-INIT.;53 11052 +(FILECREATED "15-Jun-2026 13:49:34" {DSK}frank>il>online>docker¬medley>init>ONLINE-INIT.;56 12311 :EDIT-BY "FGH" - :CHANGES-TO (FNS Online.SftpInitInfo) + :CHANGES-TO (VARS ONLINE-INITCOMS) + (FNS Online.FixNotecardsDocButton) - :PREVIOUS-DATE "18-Nov-2025 23:19:56" -{DSK}frank>il>online>docker¬medley>init>ONLINE-INIT.;52) + :PREVIOUS-DATE "15-Jun-2026 12:26:16" +{DSK}frank>il>online>docker¬medley>init>ONLINE-INIT.;54) (PRETTYCOMPRINT ONLINE-INITCOMS) @@ -26,8 +27,9 @@ (ONLINEP NIL)) (ADVISE (SAVEVM :IN \IDLER)) (FNS Online.SftpInitInfo Online.SftpUpdateInfo Online.SetUpNOTECARDSDIRECTORIES - Online.FileButton Online.DoInit ONLINEP) - (DECLARE%: DONTEVAL@LOAD DOCOPY (P (Online.DoInit))) + Online.FileButton Online.DoInit ONLINEP Online.FixNotecardsDocButton) + (DECLARE%: DONTEVAL@LOAD DOCOPY (P (Online.DoInit)) + (P (Online.FixNotecardsDocButton))) (DECLARE%: FIRST DONTEVAL@LOAD DOCOPY (P (BKSYSBUF " "]) (FILESLOAD (SYSLOAD) @@ -60,10 +62,11 @@ (DEFINEQ (Online.SftpInitInfo - [LAMBDA NIL (* ; "Edited 8-Jun-2026 13:02 by FGH") + [LAMBDA NIL (* ; "Edited 15-Jun-2026 12:20 by fgh") + (* ; "Edited 8-Jun-2026 13:02 by FGH") (* ; "Edited 17-Dec-2021 01:25 by abc") - (SETQ Online.SftpPort (UNIX-GETENV "SFTP_PORT")) - (SETQ Online.SftpPassword (UNIX-GETENV "SFTP_PWD")) + (SETQ Online.SftpPort (UNIX-GETENV "SFTP¬PORT")) + (SETQ Online.SftpPassword (UNIX-GETENV "SFTP¬PWD")) (SETQ Online.SftpDisplay (CONCAT Online.SftpPort " / " (L-CASE USERNAME) " / " Online.SftpPassword)) (SETQ Online.SftpDisplayMenu (create MENU @@ -110,7 +113,8 @@ NIL]) (Online.FileButton - [LAMBDA NIL (* ; "Edited 18-Mar-2025 22:31 by guest") + [LAMBDA NIL (* ; "Edited 15-Jun-2026 12:10 by fgh") + (* ; "Edited 18-Mar-2025 22:31 by guest") (* ; "Edited 17-Mar-2025 16:51 by fgh") (* ; "Edited 16-Mar-2025 23:40 by guest") @@ -147,7 +151,7 @@ YCOORD _ (IDIFFERENCE (fetch BOTTOM of (WINDOWPROP LowestButton 'REGION)) 85))) - (SETQ B (CREATE-BUTTON '(ShellBrowse (UNIX-GETENV "OIO_FB_URL")) + (SETQ B (CREATE-BUTTON '(ShellBrowse (UNIX-GETENV "OIO¬FB¬URL")) "IMPORT/EXPORT" P)) (WINDOWPROP B 'RIGHTBUTTONFN 'NILL) [WINDOWPROP B 'BUTTONEVENTFN (FUNCTION (LAMBDA (BUTTON) @@ -158,6 +162,8 @@ (Online.DoInit [LAMBDA NIL + (* ;; "Edited 15-Jun-2026 12:16 by fgh") + (* ;; "Edited 29-Oct-2025 23:55 by FGH") (* ;; "Edited 16-Mar-2025 23:26 by guest") @@ -207,7 +213,7 @@ (* ;; "set ONLINEP as a definitive flag that this is an online session") (SETQ ONLINEP (COND - ((STRING-EQUAL (UNIX-GETENV 'MEDLEY_ONLINE) + ((STRING-EQUAL (UNIX-GETENV 'MEDLEY¬ONLINE) "true") T) (T NIL))) @@ -215,9 +221,9 @@ (* ;;  "set the opener for accesssing the Common Lisp Hyperspec - for use in HELPSYS LispUsers package") - (SETQ CLHS.OPENER "/usr/local/interlisp/online/bin/request_new_tab") - (SETQ ShellOpener "/usr/local/interlisp/online/bin/request_new_tab") - (SETQ ShellBrowser "/usr/local/interlisp/online/bin/request_new_tab") + (SETQ CLHS.OPENER "/usr/local/interlisp/online/bin/request-new-tab") + (SETQ ShellOpener "/usr/local/interlisp/online/bin/request-new-tab") + (SETQ ShellBrowser "/usr/local/interlisp/online/bin/request-new-tab") (* ;; " get rid of Notecards logout prevention") @@ -234,24 +240,40 @@ (* ;; "If there is a start-script file, load it ") - (LET [(START-SCRIPT (UNIX-GETENV 'START_SCRIPT] + (LET [(START-SCRIPT (UNIX-GETENV 'START¬SCRIPT] (IF START-SCRIPT THEN (LOAD START-SCRIPT]) (ONLINEP [LAMBDA NIL (* ; "Edited 24-Feb-2024 22:31 by fgh") ONLINEP]) + +(Online.FixNotecardsDocButton + [LAMBDA NIL (* ; "Edited 15-Jun-2026 13:44 by FGH") + + (* ;; "Added 2026-06-15 to temporarily patch and error in APPS-INIT. Should be deleted when APPS-INIT updated.") + + (for B in *ALL-BUTTONS* when (AND (EQ (WINDOWPROP B 'Apps.BUTTON) + 'DOC) + (STREQUAL (BUTTON-LABEL B) + "NOTECARDS")) do (WINDOWPROP B 'BUTTON-ACTION + '(Apps.ShowDoc + "https://interlisp.org/documentation/notecards¬user¬guide¬v1.2.pdf" + ]) ) (DECLARE%: DONTEVAL@LOAD DOCOPY (Online.DoInit) + + +(Online.FixNotecardsDocButton) ) (DECLARE%: FIRST DONTEVAL@LOAD DOCOPY (BKSYSBUF " ") ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1831 10916 (Online.SftpInitInfo 1841 . 2825) (Online.SftpUpdateInfo 2827 . 3082) ( -Online.SetUpNOTECARDSDIRECTORIES 3084 . 4792) (Online.FileButton 4794 . 7622) (Online.DoInit 7624 . -10777) (ONLINEP 10779 . 10914))))) + (FILEMAP (NIL (1960 12138 (Online.SftpInitInfo 1970 . 3063) (Online.SftpUpdateInfo 3065 . 3320) ( +Online.SetUpNOTECARDSDIRECTORIES 3322 . 5030) (Online.FileButton 5032 . 7969) (Online.DoInit 7971 . +11174) (ONLINEP 11176 . 11311) (Online.FixNotecardsDocButton 11313 . 12136))))) STOP diff --git a/docker_medley/init/ONLINE-INIT.LCOM b/docker_medley/init/ONLINE-INIT.LCOM index 4cad966..9937b1f 100644 Binary files a/docker_medley/init/ONLINE-INIT.LCOM and b/docker_medley/init/ONLINE-INIT.LCOM differ diff --git a/docker_medley/library/ONLINEUTILS b/docker_medley/library/ONLINEUTILS index f1a66ef..9fd52ee 100644 --- a/docker_medley/library/ONLINEUTILS +++ b/docker_medley/library/ONLINEUTILS @@ -1,14 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "13-Dec-2025 22:45:29" {DSK}medley>il>medley>library>ONLINEUTILS.;1 3336 +(FILECREATED "15-Jun-2026 12:25:35" {DSK}medley>il>ONLINEUTILS.;2 3349 :EDIT-BY "fgh" - :CHANGES-TO (VARS ONLINEUTILSCOMS) - (FNS Online.WebfileURL Online.OpenWebfile) + :CHANGES-TO (FNS Online.WebfileURL) - :PREVIOUS-DATE "18-Nov-2025 22:54:33" {DSK}local>interlisp>medley>library>ONLINEUTILS.;1 -) + :PREVIOUS-DATE "13-Dec-2025 22:45:29" {DSK}medley>il>ONLINEUTILS.;1) (PRETTYCOMPRINT ONLINEUTILSCOMS) @@ -49,13 +47,14 @@ OUTNAME]) (Online.WebfileURL - [LAMBDA (WebFilePath) (* ; "Edited 13-Dec-2025 22:40 by fgh") + [LAMBDA (WebFilePath) (* ; "Edited 15-Jun-2026 12:13 by fgh") + (* ; "Edited 13-Dec-2025 22:40 by fgh") (* ;; "Return the URL that will acess a webfile using the OIO https server") (* ;; "WebfilePath is the path for the file below {WEBFILES}")  (* ; "Edited 13-Dec-2025 21:59 by fgh") - (CONCAT "https://online.interlisp.org:" (UNIX-GETENV "OIO_WEBFILES_PORT") + (CONCAT "https://online.interlisp.org:" (UNIX-GETENV "OIO¬WEBFILES¬PORT") "/" WebFilePath]) (Online.OpenWebfile @@ -72,6 +71,6 @@ (PSEUDOHOST 'WEBFILES (CONCAT LOGINDIR "/webfiles")) (DECLARE%: DONTCOPY - (FILEMAP (NIL (671 3259 (ShellHttpGet 681 . 2310) (Online.WebfileURL 2312 . 2817) (Online.OpenWebfile -2819 . 3257))))) + (FILEMAP (NIL (575 3272 (ShellHttpGet 585 . 2214) (Online.WebfileURL 2216 . 2830) (Online.OpenWebfile +2832 . 3270))))) STOP diff --git a/docker_medley/library/ONLINEUTILS.LCOM b/docker_medley/library/ONLINEUTILS.LCOM index d9a2479..565cc03 100644 Binary files a/docker_medley/library/ONLINEUTILS.LCOM and b/docker_medley/library/ONLINEUTILS.LCOM differ diff --git a/docker_medley/scripts/request_new_tab.sh b/docker_medley/scripts/request-new-tab.sh similarity index 100% rename from docker_medley/scripts/request_new_tab.sh rename to docker_medley/scripts/request-new-tab.sh