Skip to content

Commit 94d69bd

Browse files
aplteamaplteam
committed
Make
1 parent 46046e3 commit 94d69bd

File tree

7 files changed

+69
-53
lines changed

7 files changed

+69
-53
lines changed

‎APLSource/Admin/InstallCider.aplf‎

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,59 @@
66
⍝ If `batch` is 0 (the default) a message is returned via `r` reporting success, otherwise the
77
⍝ path to the installation folder is returned.
88
r←''
9-
batch←{0<⎕NC ⍵:⍎⍵ ⋄ 0}'batch'
10-
C←##.Cider
11-
aplVersion←# ⎕WG'APLVersion'
12-
selectFlag←0
13-
:Select os←C.APLTreeUtils2.GetOperatingSystem ⍬
14-
:Case 'Win'
15-
:If ~⎕NEXISTS installFolder←if1←(2⊃4070⌶0),'\SessionExtensions\CiderTatin\Cider'
16-
:AndIf ~⎕NEXISTS installFolder←if2←(1⊃⎕NPARTS 2⊃4070⌶0),'Dyalog APL Files\SessionExtensions\CiderTatin\Cider'
17-
selectFlag←1
18-
:EndIf
19-
:Case 'Lin'
20-
:If ~⎕NEXISTS installFolder←if1←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/dyalog.files/SessionExtensions/CiderTatin/Cider'
21-
:AndIf ~⎕NEXISTS installFolder←if2←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/','dyalog.',('.'~⍨{⍵/⍨2>+\⍵='.'}2⊃aplVersion),'U',(¯2↑1⊃aplVersion),'.files/SessionExtensions/CiderTatin/Cider'
22-
selectFlag←1
23-
:EndIf
24-
:Case 'Mac'
25-
:If ~⎕NEXISTS installFolder←if1←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/dyalog.files/SessionExtensions/CiderTatin/Cider'
26-
:AndIf ~⎕NEXISTS installFolder←if2←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/','dyalog.',('.'~⍨{⍵/⍨2>+\⍵='.'}2⊃aplVersion),'U',(¯2↑1⊃aplVersion),'.files/SessionExtensions/CiderTatin/Cider'
27-
selectFlag←1
28-
:EndIf
29-
:Else
30-
0 Assert⍨'OS <',os,'> is not supported'
31-
:EndSelect
32-
:If selectFlag
33-
ind←'Into which folder?'C.CommTools.Select'Version specific' 'Version agnostic'
34-
:If 0=≢ind
35-
⎕←'Cancelled by user' ⋄ →0
36-
:ElseIf ind=1
37-
installFolder←if1
38-
:ElseIf ind=2
39-
installFolder←if2
9+
:If flag
10+
batch←{0<⎕NC ⍵:⍎⍵ ⋄ 0}'batch'
11+
C←##.Cider
12+
aplVersion←# ⎕WG'APLVersion'
13+
selectFlag←0
14+
:Select os←C.APLTreeUtils2.GetOperatingSystem ⍬
15+
:Case 'Win'
16+
:If ~⎕NEXISTS installFolder←if1←(2⊃4070⌶0),'\SessionExtensions\CiderTatin\Cider'
17+
:AndIf ~⎕NEXISTS installFolder←if2←(1⊃⎕NPARTS 2⊃4070⌶0),'Dyalog APL Files\SessionExtensions\CiderTatin\Cider'
18+
selectFlag←1
19+
:EndIf
20+
:Case 'Lin'
21+
:If ~⎕NEXISTS installFolder←if1←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/dyalog.files/SessionExtensions/CiderTatin/Cider'
22+
:AndIf ~⎕NEXISTS installFolder←if2←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/','dyalog.',('.'~⍨{⍵/⍨2>+\⍵='.'}2⊃aplVersion),'U',(¯2↑1⊃aplVersion),'.files/SessionExtensions/CiderTatin/Cider'
23+
selectFlag←1
24+
:EndIf
25+
:Case 'Mac'
26+
:If ~⎕NEXISTS installFolder←if1←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/dyalog.files/SessionExtensions/CiderTatin/Cider'
27+
:AndIf ~⎕NEXISTS installFolder←if2←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/','dyalog.',('.'~⍨{⍵/⍨2>+\⍵='.'}2⊃aplVersion),'U',(¯2↑1⊃aplVersion),'.files/SessionExtensions/CiderTatin/Cider'
28+
selectFlag←1
29+
:EndIf
4030
:Else
41-
∘∘∘ ⍝ Huh?!
31+
0 Assert⍨'OS <',os,'> is not supported'
32+
:EndSelect
33+
:If selectFlag
34+
ind←'Into which folder?'C.CommTools.Select'Version specific' 'Version agnostic'
35+
:If 0=≢ind
36+
⎕←'Cancelled by user' ⋄ →0
37+
:ElseIf ind=1
38+
installFolder←if1
39+
:ElseIf ind=2
40+
installFolder←if2
41+
:Else
42+
∘∘∘ ⍝ Huh?!
43+
:EndIf
4244
:EndIf
43-
:EndIf
44-
ZIPs←C.FilesAndDirs.ListFiles ##.CiderConfig.HOME,'/Dist/*.zip'
45-
ZIPs←{⍵/⍨'Installed-'{⍺∘≢¨(≢⍺)↑¨{2⊃⎕NPARTS ⍵}¨⍵}⍵}ZIPs
46-
Assert 1=≢ZIPs
47-
zipFilename←⊃ZIPs
48-
:If batch
49-
q←'Install:',(⎕UCS 13),(' ',zipFilename),(⎕UCS 13),'into:',(⎕UCS 13),' ',installFolder,' ?'
50-
:OrIf C.CommTools.YesOrNo q
51-
{}##.Cider.FilesAndDirs.RmDir installFolder
52-
3 ⎕MKDIR installFolder
53-
res←⎕SE.Tatin.InstallPackages(⊃ZIPs)installFolder
54-
Assert 1=≢res
55-
Assert(1⊃res)≡(2⊃⎕NPARTS zipFilename)
45+
ZIPs←C.FilesAndDirs.ListFiles ##.CiderConfig.HOME,'/Dist/*.zip'
46+
ZIPs←{⍵/⍨'Installed-'{⍺∘≢¨(≢⍺)↑¨{2⊃⎕NPARTS ⍵}¨⍵}⍵}ZIPs
47+
Assert 1=≢ZIPs
48+
zipFilename←⊃ZIPs
5649
:If batch
57-
r←installFolder
58-
:Else
59-
⎕SE.SALTUtils.ResetUCMDcache ¯1
60-
r←'*** Cider installed in ',installFolder
50+
q←'Install:',(⎕UCS 13),(' ',zipFilename),(⎕UCS 13),'into:',(⎕UCS 13),' ',installFolder,' ?'
51+
:OrIf C.CommTools.YesOrNo q
52+
{}##.Cider.FilesAndDirs.RmDir installFolder
53+
3 ⎕MKDIR installFolder
54+
res←⎕SE.Tatin.InstallPackages(⊃ZIPs)installFolder
55+
Assert 1=≢res
56+
Assert(1⊃res)≡(2⊃⎕NPARTS zipFilename)
57+
:If batch
58+
r←installFolder
59+
:Else
60+
⎕SE.SALTUtils.ResetUCMDcache ¯1
61+
r←'*** Cider installed in ',installFolder
62+
:EndIf
6163
:EndIf
6264
:EndIf

‎APLSource/Cider/CheckForDropboxConflicts.aplf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
⍝ Checks whether there are any Dropbox files indicating conflictes, and if so print them to the session.
33
⍝ Returns 0 in case there are not any such conflict files, otherwise the number of files found.
44
r←''
5-
:If 0<≢path
5+
:If 0<≢path~' '
66
:If GetGlobalDropboxConflicts
77
⎕←'Checking for Dropbox conflicts: ',path,' ...'
88
r←≢list←'recursive'F.ListFiles path,'/*conflicted copy*'

‎APLSource/Cider/History.apla‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
(
2-
'* 0.42.3 ⋄ 2024-08-17'
2+
'* 0.42.3 ⋄ 2024-09-05'
33
' * Bug fixes'
44
' * Documentation amanded'
5+
' * `CheckForDropBoxConflict` crashed on a path that consisted of nothing but spaces '
56
'* 0.42.2 ⋄ 2024-08-16'
67
' * Bug fixes'
78
' * OpenProject printed wrong messages to session in case of -verbose'

‎APLSource/Cider/Version.aplf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
r←Version
22
⍝ See also `History`
3-
r←'0.42.3-beta-1+671'
3+
r←'0.42.3+671'

‎apl-package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
tags: "project-management",
2222
tatin_version: "0.103.0",
2323
userCommandScript: "APLSource/Cider_UC.dyalog",
24-
version: "0.42.3+788",
24+
version: "0.42.3+792",
2525
}

‎docs/ReleaseNotes.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ In short, when compatability is affected.
1414

1515
This document does not come with a complete list of fixes, added features etc. Consult [Cider on GitHub](https://github.com/aplteam/Cider/releases) for that.
1616

17+
## Version 0.42.3 from 2024-09-05
18+
19+
Just bug fixes
20+
21+
1722
## Version 0.42.2 from 2024-08-04
1823

1924
Just bug fixes
@@ -35,3 +40,4 @@ Just bug fixes
3540

3641

3742

43+

‎html/ReleaseNotes.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ <h2 id="toc-heading">Table of contents</h2>
2424

2525
<div class="toc-container">
2626
<ul id="toc-list" class="hide print">
27+
<li class="toc-entry toc-h2"><a href="#version-0423-from-2024-09-05">Version 0.42.3 from 2024-09-05</a></li>
2728
<li class="toc-entry toc-h2"><a href="#version-0422-from-2024-08-04">Version 0.42.2 from 2024-08-04</a></li>
2829
<li class="toc-entry toc-h2"><a href="#version-0421-from-2024-07-12">Version 0.42.1 from 2024-07-12</a>
2930
</ul>
@@ -37,6 +38,12 @@ <h2 id="toc-heading">Table of contents</h2>
3738
<p>In short, when compatability is affected.</p>
3839
<p>This document does not come with a complete list of fixes, added features etc. Consult <a href="https://github.com/aplteam/Cider/releases" class="external_link">Cider on GitHub</a> for that.</p>
3940
<div class="h_tag">
41+
<a href="#version-0423-from-2024-09-05" id="version-0423-from-2024-09-05" class="autoheader_anchor">
42+
<h2 data-id="Version-0423-from-2024-09-05">Version 0.42.3 from 2024-09-05</h2>
43+
</a>
44+
</div>
45+
<p>Just bug fixes</p>
46+
<div class="h_tag">
4047
<a href="#version-0422-from-2024-08-04" id="version-0422-from-2024-08-04" class="autoheader_anchor">
4148
<h2 data-id="Version-0422-from-2024-08-04">Version 0.42.2 from 2024-08-04</h2>
4249
</a>

0 commit comments

Comments
 (0)