From 6caacbac314c7efcd133da32de16a814c8e60ea2 Mon Sep 17 00:00:00 2001 From: Jaroslav Tulach Date: Sat, 14 Mar 2026 21:18:16 +0100 Subject: [PATCH] Setting NETBEANS_USERDIR to IGNORE shall use netbeans_default_userdir --- nb/ide.launcher/unix/netbeans | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/nb/ide.launcher/unix/netbeans b/nb/ide.launcher/unix/netbeans index 3f65db67a3f6..6aee99558fec 100644 --- a/nb/ide.launcher/unix/netbeans +++ b/nb/ide.launcher/unix/netbeans @@ -81,17 +81,19 @@ fi export DEFAULT_USERDIR_ROOT -if ! [ "$NETBEANS_USERDIR" = "IGNORE" ]; then - # make sure own launcher directory is on PATH as a fallback - PATH=$PATH:`echo $progdir | absolutize_paths` -fi - # #68373: look for userdir, but do not modify "$@" -if [ -z "$NETBEANS_USERDIR" ]; then +if [ "$NETBEANS_USERDIR" = "IGNORE" ]; then userdir="${netbeans_default_userdir}" else - userdir="$NETBEANS_USERDIR" + # make sure own launcher directory is on PATH as a fallback + PATH=$PATH:`echo $progdir | absolutize_paths` + if [ -z "$NETBEANS_USERDIR" ]; then + userdir="${netbeans_default_userdir}" + else + userdir="$NETBEANS_USERDIR" + fi fi + cachedir="${netbeans_default_cachedir}" founduserdir=""