Skip to content

Commit

Permalink
Improved installation on OS4 when elf.library 53.35+ is present
Browse files Browse the repository at this point in the history
  • Loading branch information
Futaura committed Dec 9, 2023
1 parent b85a8ff commit 35eb9ea
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions dist/Install-AmiSSL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; $VER: Install-AmiSSL 5.0.3 (12.12.2022)
; $VER: Install-AmiSSL 5.13 (7.12.2023)

(set #AmiUpdate (if (= @app-name "AmiUpdate") 1 0))

Expand Down Expand Up @@ -349,34 +349,38 @@

(set #resident-lib-ver (getversion "amisslmaster.library" (resident)))

; Try to force ramlib on OS4 to expunge libraries to release
; exclusive library file locks
; Try to force ramlib on OS4 to expunge libraries to release exclusive
; library file locks, which is necessary until AmiSSL 5.6 + elf.library 53.35
(if (= #detectedSystem "os4")
(
(set #elflib-ver (getversion "elf.library" (resident)))
(set #elflib-min (+ (* 65536 53) 35))
(set #amissl-min (+ (* 65536 5) 6))
(foreach (tackon #libs-dir "AmiSSL") "amissl_v#?.library"
(
(set #resident-lib-ver (getversion @each-name (resident)))
(if (> #resident-lib-ver 0)
(if (AND (> #resident-lib-ver 0) (OR (< #resident-lib-ver #amissl-min) (< #elflib-ver #elflib-min)))
(
(set #lib-name ((tackon (tackon #libs-dir "AmiSSL") @each-name)))
(rename #lib-name (cat #lib-name "-expunge"))
(rename (cat #lib-name "-expunge") #lib-name)
)
)

)
)
(set #resident-lib-ver (getversion "amisslmaster.library" (resident)))
(if (> #resident-lib-ver 0)
(if (AND (> #resident-lib-ver 0) (OR (< #resident-lib-ver #amissl-min) (< #elflib-ver #elflib-min)))
(
(set #lib-name (tackon #libs-dir "amisslmaster.library"))
(rename #lib-name (cat #lib-name "-expunge"))
(rename (cat #lib-name "-expunge") #lib-name)
(set #resident-lib-ver (getversion "amisslmaster.library" (resident)))
(if (> #resident-lib-ver 0)
(abort #str-reboot-before-install)
)
)
)
(set #resident-lib-ver (getversion "amisslmaster.library" (resident)))
(if (> #resident-lib-ver 0)
(abort #str-reboot-before-install)
)
)
)

Expand Down

0 comments on commit 35eb9ea

Please sign in to comment.