From 929a2d5169b3f78ec20ca0b535bff61283e4b60e Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sat, 29 May 2010 04:13:04 -0400 Subject: [PATCH] tools.deploy.macosx: make deployment work when we're not running the .app bundle --- basis/tools/deploy/macosx/macosx.factor | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/basis/tools/deploy/macosx/macosx.factor b/basis/tools/deploy/macosx/macosx.factor index 446f453709..ecfe529286 100644 --- a/basis/tools/deploy/macosx/macosx.factor +++ b/basis/tools/deploy/macosx/macosx.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2007, 2009 Slava Pestov. +! Copyright (C) 2007, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: io io.files io.files.info.unix io.pathnames io.directories io.directories.hierarchy kernel namespaces make @@ -10,7 +10,10 @@ combinators vocabs.metadata vocabs.loader ; IN: tools.deploy.macosx : bundle-dir ( -- dir ) - vm parent-directory parent-directory ; + running.app? + [ vm parent-directory parent-directory ] + [ "resource:Factor.app" ] + if ; : copy-bundle-dir ( bundle-name dir -- ) [ bundle-dir prepend-path swap ] keep @@ -70,7 +73,6 @@ IN: tools.deploy.macosx -> selectFile:inFileViewerRootedAtPath: drop ; M: macosx deploy* ( vocab -- ) - ".app deploy tool" assert.app "resource:" [ dup deploy-config [ bundle-name dup exists? [ delete-tree ] [ drop ] if