This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new e124ee6 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 new a01e4c2 Merge pull request #1203 from oyarzun/app-conf e124ee6 is described below commit e124ee61512a483cc79932269850785f069c59ba Author: Christian Oyarzun <c...@oyarzun.net> AuthorDate: Wed Apr 17 11:06:53 2019 -0400 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 779225a..dfd9236 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 7e67408..e42e1d4 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}" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists