apache
diff --git a/‎nb/ide.launcher/unix/netbeans‎
Lines changed: 7 additions & 3 deletions b/‎nb/ide.launcher/unix/netbeans‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎nb/o.n.upgrader/arch.xml‎
Lines changed: 9 additions & 0 deletions b/‎nb/o.n.upgrader/arch.xml‎
Lines changed: 9 additions & 0 deletions
@@ -38,9 +38,6 @@ cd "$progdir"/..
 basedir=`pwd`
 cd "$old"
 
-# make sure own launcher is on PATH
-PATH=$PATH:$progdir
-
 case "`uname`" in
     Darwin*)
         # set default userdir and cachedir on Mac OS X
@@ -68,6 +65,13 @@ fi
 
 export DEFAULT_USERDIR_ROOT
 
+if [ "$NETBEANS_USERDIR" = "nope" ]; then
+    # setting NETBEANS_USERDIR to none is an opt-out
+else
+    # make sure own launcher directory is on PATH as a fallback
+    PATH=$PATH:$progdir
+fi
+
 # #68373: look for userdir, but do not modify "$@"
 if [ -z "$NETBEANS_USERDIR" ]; then
     userdir="${netbeans_default_userdir}"
 
@@ -646,6 +646,15 @@
          and will open files in the same instance just as 
          <a href="https://github.com/apache/netbeans/pull/8756">#8756 illustrates</a>.
          </p>
+         <p>
+             The launcher also modifies the <code>PATH</code> variable
+             by appending its own diretory - making sure typing <code>netbeans</code>
+             gets handled in the internal NetBeans terminal at all.
+             In the unusual and rare cases when <b>opt-out</b> of this
+             behavior maybe needed, just
+             set the environment variable to <code>nope</code> to instruct
+             the launcher to avoid these environment variable modifications.
+         </p>
     </api>
      </li>
   </ul>