From e124ee61512a483cc79932269850785f069c59ba Mon Sep 17 00:00:00 2001
From: Christian Oyarzun <co@oyarzun.net>
Date: Wed, 17 Apr 2019 11:06:53 -0400
Subject: [PATCH] Fix launcher on macOS after changes from #573 * Remove extra
 " in app.conf * Check for old default_mac_userdir variable in case RCP has a
 custom app.conf with old settings; otherwise use default_userdir

---
 harness/apisupport.harness/release/etc/app.conf     | 2 +-
 harness/apisupport.harness/release/launchers/app.sh | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/harness/apisupport.harness/release/etc/app.conf b/harness/apisupport.harness/release/etc/app.conf
index 779225a3b5c1..dfd92364b7a6 100644
--- a/harness/apisupport.harness/release/etc/app.conf
+++ b/harness/apisupport.harness/release/etc/app.conf
@@ -54,7 +54,7 @@
 #
 
 default_userdir="${DEFAULT_USERDIR_ROOT}/dev"
-default_cachedir=""${DEFAULT_CACHEDIR_ROOT}/dev"
+default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev"
 
 # options used by the launcher by default, can be overridden by explicit
 # command line switches
diff --git a/harness/apisupport.harness/release/launchers/app.sh b/harness/apisupport.harness/release/launchers/app.sh
index 7e67408c01e2..e42e1d4b1c15 100644
--- a/harness/apisupport.harness/release/launchers/app.sh
+++ b/harness/apisupport.harness/release/launchers/app.sh
@@ -57,7 +57,11 @@ args=""
 
 case "`uname`" in
     Darwin*)
-        userdir="${default_mac_userdir}"
+        if [ ! -z "$default_mac_userdir" ]; then
+          userdir="${default_mac_userdir}"
+        else
+          userdir="${default_userdir}"
+        fi
         ;;
     *)
         userdir="${default_userdir}"