From 672bb754c352de8b307d0661281d13e140e37e9a Mon Sep 17 00:00:00 2001
From: ofTheo <theo@openframeworks.cc>
Date: Wed, 16 Oct 2019 15:24:06 -0700
Subject: [PATCH 1/2] adds _runMeFirst.command to macOS packages to escape
 translocation. closes #220

---
 scripts/osx/_macOSTranslocationFix.command | 3 +++
 scripts/osx/buildPG.sh                     | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100755 scripts/osx/_macOSTranslocationFix.command

diff --git a/scripts/osx/_macOSTranslocationFix.command b/scripts/osx/_macOSTranslocationFix.command
new file mode 100755
index 00000000..f0e0cf22
--- /dev/null
+++ b/scripts/osx/_macOSTranslocationFix.command
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+xattr -r -d com.apple.quarantine projectGenerator.app
diff --git a/scripts/osx/buildPG.sh b/scripts/osx/buildPG.sh
index be8a7a28..885d2367 100755
--- a/scripts/osx/buildPG.sh
+++ b/scripts/osx/buildPG.sh
@@ -25,6 +25,11 @@ sign_and_upload(){
     # Copy commandLine into electron .app
     cd ${pg_root}
     cp commandLine/bin/projectGenerator projectGenerator-$PLATFORM/projectGenerator.app/Contents/Resources/app/app/projectGenerator 2> /dev/null
+    
+    # Copy in the terminal script which fixes app translocation
+    cp scripts/osx/_macOSTranslocationFix.command projectGenerator-$PLATFORM/_runMeFirst.command
+    chmod a+x projectGenerator-$PLATFORM/_runMeFirst.command
+    
     sed -i -e "s/osx/$PLATFORM/g" projectGenerator-$PLATFORM/projectGenerator.app/Contents/Resources/app/settings.json
 
     echo "${TRAVIS_REPO_SLUG}/${TRAVIS_BRANCH}";

From 6b47f0869e012b19fd1d40c4b8fa1684141541b4 Mon Sep 17 00:00:00 2001
From: ofTheo <theo@openframeworks.cc>
Date: Wed, 16 Oct 2019 15:33:15 -0700
Subject: [PATCH 2/2] 10.12 translocation message instructions

---
 frontend/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/index.html b/frontend/index.html
index 4a7530d5..1b9df434 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -294,9 +294,9 @@
 					</div>
 					<div class="ui negative message" id="ofPathSierraMessage" style="display: none">
 						<div class="header">
-							Running on OSX Sierra or later for the first time?
+							Running on macOS 10.12 or later for the first time?
 						</div>
-						<p>For security reasons, please set the OF path to root of openframeworks (ie, the folder which has "addons", "libs", in it)</p>
+						<p>Please close the ProjectGenerator. Double click on _runMeFirst.command and then re-open the projectGenerator. If the OF path is not the root of the unzipped OF folder please set the OF path to this folder (ie, the folder which has "addons", "libs", in it)</p>
 					</div>
 					<div class="field">
 						<div class="ui checkbox verbose">