Skip to content

Commit 000635f

Browse files
committed
Setting NETBEANS_USERDIR=IGNORE shall use netbeans_default_userdir
1 parent 9f426ec commit 000635f

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

nb/ide.launcher/unix/netbeans

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,19 @@ fi
8181

8282
export DEFAULT_USERDIR_ROOT
8383

84-
if ! [ "$NETBEANS_USERDIR" = "IGNORE" ]; then
85-
# make sure own launcher directory is on PATH as a fallback
86-
PATH=$PATH:`echo $progdir | absolutize_paths`
87-
fi
88-
8984
# #68373: look for userdir, but do not modify "$@"
90-
if [ -z "$NETBEANS_USERDIR" ]; then
85+
if [ "$NETBEANS_USERDIR" = "IGNORE" ]; then
9186
userdir="${netbeans_default_userdir}"
9287
else
93-
userdir="$NETBEANS_USERDIR"
88+
# make sure own launcher directory is on PATH as a fallback
89+
PATH=$PATH:`echo $progdir | absolutize_paths`
90+
if [ -z "$NETBEANS_USERDIR" ]; then
91+
userdir="${netbeans_default_userdir}"
92+
else
93+
userdir="$NETBEANS_USERDIR"
94+
fi
9495
fi
96+
9597
cachedir="${netbeans_default_cachedir}"
9698

9799
founduserdir=""

0 commit comments

Comments
 (0)