GetProgramFilesFolder added as public function & bug fix in ]UpdateCider

aplteam · aplteam · commit 3b4971ac00a4 · 2023-09-26T10:53:49.000+02:00
diff --git a/APLSource/Cider/API/GetProgramFilesFolder.aplf b/APLSource/Cider/API/GetProgramFilesFolder.aplf
@@ -0,0 +1 @@
+ GetProgramFilesFolder←{⍺←⊢ ⋄ ⍺ ##.GetProgramFilesFolder ⍵}
diff --git a/APLSource/Cider/Public.aplf b/APLSource/Cider/Public.aplf
@@ -13,6 +13,7 @@
  r,←⊂'GetCiderGlobalConfigHomeFolder'
  r,←⊂'GetMyUCMDsFolder'
  r,←⊂'GetNuGetDependencies'
+ r,←⊂'GetProgramFilesFolder'
  r,←⊂'GetProjectPath'
  r,←⊂'GetTatinDependencies'
  r,←⊂'HasDotNet'
diff --git a/APLSource/Cider/Version.aplf b/APLSource/Cider/Version.aplf
@@ -1,3 +1,3 @@
  r←Version
 ⍝ See als History
- r←'0.36.0+589'
+ r←'0.36.0+591'
diff --git a/APLSource/Cider_uc.dyalog b/APLSource/Cider_uc.dyalog
@@ -249,7 +249,8 @@
               targetFolder ⎕NMOVE⍠1⊣tempFolder,'/*'
               r←'Cider was successfully updated to version ',{1↓⍵/⍨2≤+\⍵='-'}⊃res
               {}P.##.F.RmDirByForce tempFolder
-              :If folder←P.##.F.IsDir P.GetMyUCMDsFolder,'/Cider'
+              folder←P.GetMyUCMDsFolder,'/Cider'
+              :If P.##.F.IsDir folder
                   q←'RemoveCiderFromMyUCMDs@There is a folder Cider/ in ',P.GetMyUCMDsFolder,'/',⎕UCS 13
                   q,←'Shall this folder be removed?'
               :AndIf 1 P.##.C.YesOrNo q
diff --git a/TestData/myproj/APLSource/.linkconfig b/TestData/myproj/APLSource/.linkconfig
@@ -1 +1 @@
-{  Settings: {    codeExtensions: [      "aplf",      "aplo",      "apln",      "aplc",      "apli",      "dyalog",      "apl",      "mipage",    ],    forceFilenames: 1,    typeExtensions: [      [        2,        "apla",      ],      [        3,        "aplf",      ],      [        4,        "aplo",      ],      [        9.1,        "apln",      ],      [        9.4,        "aplc",      ],      [        9.5,        "apli",      ],    ],    watch: "ns",  },}
+{  Settings: {    forceFilenames: 1,    watch: "ns",  },}
diff --git a/apl-package.json b/apl-package.json
@@ -19,5 +19,5 @@
   source: "APLSource/Cider/",
   tags: "project-management",
   userCommandScript: "APLSource/Cider_UC.dyalog",
-  version: "0.36.0+589",
+  version: "0.36.0+591",
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ GetProgramFilesFolder←{⍺←⊢ ⋄ ⍺ ##.GetProgramFilesFolder ⍵}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ Settings: { codeExtensions: [ "aplf", "aplo", "apln", "aplc", "apli", "dyalog", "apl", "mipage", ], forceFilenames: 1, typeExtensions: [ [ 2, "apla", ], [ 3, "aplf", ], [ 4, "aplo", ], [ 9.1, "apln", ], [ 9.4, "aplc", ], [ 9.5, "apli", ], ], watch: "ns", },}`
	`1`	`+{ Settings: { forceFilenames: 1, watch: "ns", },}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@`
`19`	`19`	`source: "APLSource/Cider/",`
`20`	`20`	`tags: "project-management",`
`21`	`21`	`userCommandScript: "APLSource/Cider_UC.dyalog",`
`22`		`- version: "0.36.0+589",`
	`22`	`+ version: "0.36.0+591",`
`23`	`23`	`}`