From 76a6e26faaf6af7bbcc449617f1d7af8422a281e Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Sun, 25 Feb 2024 19:59:10 -0800
Subject: [PATCH] Update APPS-INIT to update NOTECARDSDIRECTORIES appropriately
 (#1555)

* Add to APPS-INIT code to always update NOTECARDSDIRECTORIES since automatic builds do not set this correctly

* Add AROUNDEXITFN to reset NOTECARDSDIRS after returning from logout, etc.
---
 greetfiles/APPS-INIT      |  65 +++++++++++++++++++++++++++++++-------
 greetfiles/APPS-INIT.LCOM | Bin 9040 -> 10334 bytes
 2 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/greetfiles/APPS-INIT b/greetfiles/APPS-INIT
index 8c83e70e..24dde3f9 100644
--- a/greetfiles/APPS-INIT
+++ b/greetfiles/APPS-INIT
@@ -1,11 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "16-Jun-2023 17:20:09" {DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;11
 21130  
+
(FILECREATED "25-Feb-2024 13:56:23" {DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;17
 23321  
 
-      :CHANGES-TO (FNS Apps.DoInit)
+      :CHANGES-TO (VARS APPS-INITCOMS)
+                  (FNS Apps.DoInit Apps.AroundExitFn)
 
-      :PREVIOUS-DATE "19-Jan-2023 12:44:20" 
-{DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;10)
+      :PREVIOUS-DATE "25-Feb-2024 13:14:02" 
+{DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;16)
 
 
 (PRETTYCOMPRINT APPS-INITCOMS)
@@ -16,8 +17,9 @@
         (GLOBALVARS Apps.NotecardsActivated Apps.RoomsActivated)
         (INITVARS (Apps.NotecardsActivated NIL)
                (Apps.RoomsActivated NIL))
-        (FNS Apps.InitNotecards Apps.DoInit Apps.CreateButtons Apps.CreateLabel Apps.ActivateCLOS 
-             Apps.ActivateRooms Apps.ShowDoc XCL-USER::EXEC_INTERLISP)
+        (FNS Apps.InitNotecards Apps.SetUpNOTECARDSDIRECTORIES Apps.DoInit Apps.CreateButtons 
+             Apps.CreateLabel Apps.ActivateCLOS Apps.ActivateRooms Apps.ShowDoc 
+             XCL-USER::EXEC_INTERLISP Apps.AroundExitFn)
         (DECLARE%: DONTEVAL@LOAD DOCOPY (P (Apps.DoInit)))
         (DECLARE%: FIRST DONTEVAL@LOAD DOCOPY (P (BKSYSBUF " "])
 
@@ -90,6 +92,33 @@
           (if
 (NOT DoNotRefreshButtons)
               then
 (Apps.CreateButtons
])
 
+(Apps.SetUpNOTECARDSDIRECTORIES

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

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

+
+    (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
 [SETQ NCDIR (OR (INFILEP (CONCAT NCDIR "system>NOTECARDS"))
+                                   (INFILEP (CONCAT NCDIR "system>NOTECARDS.LCOM"]
+                   (SETQ NCDIR (SUBSTRING NCDIR 1 (IDIFFERENCE (STRPOS "system>NOTECARDS" NCDIR)
+                                                         1)))
+                   (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])
+
 (Apps.DoInit

   [LAMBDA NIL
 
@@ -173,7 +202,16 @@
 
            (* ;; " Make sure Notecards doesn't try to load its HASH file in NC.PostGreet")

 
-           (SETTOPVAL '\NC.SourceAccessFlg NIL])
+           (SETTOPVAL '\NC.SourceAccessFlg NIL)
+
+           (* ;; "Setup NOTECARDSDIRECTORIES.")

+
+           (Apps.SetUpNOTECARDSDIRECTORIES
)
+
+           (* ;; "Add AROUNDEXITFN to ensure NOTECARDSDIRECTORIES get reset after LOGOUT, etc.")

+
+           (SETQ AROUNDEXITFNS (LSUBST '(MEDLEY-INIT-VARS Apps.AroundExitFn)
+                                      'MEDLEY-INIT-VARS AROUNDEXITFNS])
 
 (Apps.CreateButtons

   [LAMBDA (DoDocsToo)
                                      (* ; "Edited 13-Dec-2022 12:51 by frank")


@@ -366,6 +404,11 @@
                                                         YCOORD _ (IDIFFERENCE SCREENHEIGHT 460]
            (XCL:SET-DEFAULT-EXEC-TYPE 'INTERLISP)
            (XCL:SET-EXEC-TYPE 'INTERLISP])
+
+(Apps.AroundExitFn

+  [LAMBDA (EVENT)
+    (if
 (MEMB EVENT '(AFTERLOGOUT AFTERSYSOUT AFTERSAVEVM))
+        then
 (Apps.SetUpNOTECARDSDIRECTORIES
])
 )
 (DECLARE%: DONTEVAL@LOAD DOCOPY 
 
@@ -376,8 +419,8 @@
 (BKSYSBUF " ")
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1109 20996 (Apps.InitNotecards 1119 . 4981) (Apps.DoInit 4983 . 8227) (
-Apps.CreateButtons 8229 . 17053) (Apps.CreateLabel 17055 . 17865) (Apps.ActivateCLOS 17867 . 19216) (
-Apps.ActivateRooms 19218 . 20069) (Apps.ShowDoc 20071 . 20220) (XCL-USER::EXEC_INTERLISP 20222 . 20994
-)))))
+  (FILEMAP (NIL (1229 23187 (Apps.InitNotecards 1239 . 5101) (Apps.SetUpNOTECARDSDIRECTORIES 5103 . 6658
+) (Apps.DoInit 6660 . 10257) (Apps.CreateButtons 10259 . 19083) (Apps.CreateLabel 19085 . 19895) (
+Apps.ActivateCLOS 19897 . 21246) (Apps.ActivateRooms 21248 . 22099) (Apps.ShowDoc 22101 . 22250) (
+XCL-USER::EXEC_INTERLISP 22252 . 23024) (Apps.AroundExitFn 23026 . 23185)))))
 STOP
diff --git a/greetfiles/APPS-INIT.LCOM b/greetfiles/APPS-INIT.LCOM
index 67ca0727b00a31fdb89f21bdc9f5145f599640b8..b3253ecfef408d8361e93c6ddf0f004ea0ca90c2 100644
GIT binary patch
delta 1677
zcmZ`)&u`mQ9FM!PQ3KUdq6)eReKA5L5{c|*J5Hmj!nK{&t78Y-$(Uf$(!^U$vp7mT
zMubo<oVY+`@h2c|XejiGxPn01mCLShMMxar!q-kn(xsIW`}02U`@TQk`@FB8RG!wp
zyp<thzTzF`2}=av__A0m^TNq-^%W@x43Y9To89T0P$qm?D4smouovh;p};`98G7yW
z%tgZF=xjwdG{x3rS5whwDIVb&h<>EXBMAu46AtLIvM-x^nv-`e$Tno#0l8Ll^17+J
zidA)Tkgb@=^?HMX8t7d=oM5>hJnXi$kNvRH%|W?lYYpA1J9!l&1O04dPAId4flpND
z;M47+;DHzYOtDmP{4b?m9XVcD@0pgXDYC6Ps%~qFYuUQyKv^x(*&2voDo8^O1TZWG
z-z0wX2)Gy!1Z)hr9HgFJNu^SE@t+Ff2OU4s)G|Zejc3qiG&5S+*KZzeZf>U2mk%zT
z=8x9X)N|ESH}T^qj?RZi*QgKX!B%6x<Cl$Rn6He}@BGK#9<03o`0F!M82@y=dWK4+
z?zE2+rkaF3{_Ta>>791s+rO5|60U@sQn+~Q2*-g_-*sGDH}`<B0wAne4scs6=w>Vv
z+`W<r%E&Sm*#%A_bG|5nGNlD^P7CaeCeoZHWJa?ks9{77wxlU26{kR)E#~L;!vFD6
zy6C;CsfKntK5O(j9|&`dc346Qn89!mdJlGHx?!*yc9||1sA8NelI1z1c@aiSt|n_}
z;5g~rMJ)PicH3YEq1S5m+XHyycRJ7wLU<JPkD=EOdS1UX#M`>X0kiLQTi)9+%XCrU
z{s2a3e%L(h3=;<fFN9Xm?|ZGVGh}FpYr56!cm3}D@<PD2A6o?dAsRpIw3DTW9^8vB
zC5FXAV+w^G{9#g)9CsMNGmF_pY6}>8K8~c-*I3!M>ZYo_r@QgRui#y)JDP3ERSgF`
zp1SVpvf&txn*-`Y>QXdV{f4rm>-2T%N+i)=>^~oCHBs;V7`>Zlx3z+*<wXgMM3uk`
z+@z6QEaCA_^xsrQ<fez8w4{8}p~gSFn5NzmijbXXWML|4RA-t~^y^F86dkRuk@5DL
zyB3|?XpH~3k-0otGM)4r9eat^&`c~ZmBIX}cjkBV`>RQDSPDubS$}c*TrB76ZjLr}
z14S!BR<5|3ZCHC&-37U_fdl8ZGa1BKZfK2aF8T-ldi6rD(eJNw>+~e^R_K3(9|Og(
foaj$F6YVf>Zk*SgvvhQic_aFq*~M-6h5771Z%C&X

delta 372
zcmcZ?aKUXtxQL;du2*TEu91O}v4Wwwm63s!vEjsQUkO7^1tlW`U9Uu_oRN{0sezS&
z!Ndz<K}f=SdU{F<DTyViDOi=8C~0zOxOw`xItRHrhPb*YC}G-XV5y`qvChidP{GL1
z(AYqM%gWiq(a+sASU1F9LBq{2Si!NNpjgi(-!m_>L{q^kAjmb$(?2v=*9B-I&_GLs
zBMptLOiX}&m{@JgXs}s{$%TFLM;<Y`&|udfKSy6z1vdpF1y4WE5Kl*+V4vU+O$Eka
zMyAQ;yvrE_C*S9lW@MTCo421?fI(yPCBAQro9_w;FisW|vYH$yWW>m|xmhTLZ}K&T
z@Xb1kqAZhdsD7OMLQPu;>^R5dlFTw-C^-B02P;f|s3<boQeBl<Q$b^LiMlc)*W~Hy
KPLpq`w*UbDr)Bm4