Merge pull request #1203 from oyarzun/app-conf

[NETBEANS-2361] Fix app.conf and launcher on macOS after changes in #573
apache · May 28, 2019 · a01e4c2 · a01e4c2
2 parents 1a7cc65 + e124ee6
commit a01e4c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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}"