From a34c4f4abeb28468856efefebd6e1a9fd845048a Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Mon, 18 Nov 2024 12:42:55 -0800 Subject: [PATCH] tools.deploy.unix: make sure extension isn't appended to deploy-path on macos --- basis/tools/deploy/unix/unix.factor | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/basis/tools/deploy/unix/unix.factor b/basis/tools/deploy/unix/unix.factor index 490dd6bb616..177b75c5b51 100644 --- a/basis/tools/deploy/unix/unix.factor +++ b/basis/tools/deploy/unix/unix.factor @@ -8,9 +8,11 @@ IN: tools.deploy.unix CONSTANT: extension ".out" +: ?extension ( path -- path.out ) + os macos? [ extension append ] unless ; + : create-app-dir ( vocab bundle-name -- vm-path ) - [ os macos? [ extension append ] unless ] dip - copy-vm dup 0o755 set-file-permissions ; + [ ?extension ] dip copy-vm dup 0o755 set-file-permissions ; M: unix deploy* deploy-name get @@ -26,7 +28,7 @@ M: unix deploy-path deploy-directory get [ dup deploy-config [ deploy-name get - swap extension append append-path + swap ?extension append-path normalize-path ] with-variables ] with-directory ;