Use and modify NETBEANS_USERDIR in Windows launcher

Author: jtulach

nb/ide.launcher/windows/nblauncher.cpp

@@ -34,6 +34,7 @@
 using namespace std;
 
 const char *NbLauncher::NBEXEC_FILE_PATH = NBEXEC_DLL;
+const char *ENV_NETBEANS_USERDIR="NETBEANS_USERDIR";
 const char *NbLauncher::OPT_NB_DEFAULT_USER_DIR = "netbeans_default_userdir=";
 const char *NbLauncher::OPT_NB_DEFAULT_CACHE_DIR = "netbeans_default_cachedir=";
 const char *NbLauncher::OPT_NB_DEFAULT_OPTIONS = "netbeans_default_options=";
@@ -82,13 +83,26 @@ int NbLauncher::start(int argc, char *argv[]) {
         return -1;
     }
 
-    parseConfigFile((baseDir + "\\etc\\" + getAppName() + ".conf").c_str());
+    bool skipUserDir = false;
+    char *userDirViaEnv = getenv(ENV_NETBEANS_USERDIR);
+    if (userDirViaEnv != NULL) {
+        logMsg("NbLauncher::using NETBEANS_USERDIR env variable (%s)", userDirViaEnv);
+        string udve = userDirViaEnv;
+        if (udve == "nope") {
+            skipUserDir = true;
+            userDirViaEnv = NULL;
+        } else {
+            userDir = userDirViaEnv;
+        }
+    }
+
+    parseConfigFile((baseDir + "\\etc\\" + getAppName() + ".conf").c_str(), userDirViaEnv == NULL);
 
     if (!parseArgs(argc, argv)) {
         return -1;
     }
     string oldUserDir = userDir;
-    parseConfigFile((userDir + "\\etc\\" + getAppName() + ".conf").c_str());
+    parseConfigFile((userDir + "\\etc\\" + getAppName() + ".conf").c_str(), userDirViaEnv == NULL);
     userDir = oldUserDir;
 
     addExtraClusters();
@@ -114,6 +128,13 @@ int NbLauncher::start(int argc, char *argv[]) {
     if (!userDir.empty()) {
         newArgs.add(ARG_NAME_USER_DIR);
         newArgs.add(userDir.c_str());
+        if (!skipUserDir) {
+            string toSet = ENV_NETBEANS_USERDIR;
+            toSet = toSet + "=" + userDir;
+            putenv(toSet.c_str());
+
+
+        }
     }
     if (!defUserDirRoot.empty()) {
         newArgs.add(ARG_DEFAULT_USER_DIR_ROOT);
@@ -460,7 +481,7 @@ bool NbLauncher::getOption(char *&str, const char *opt) {
     return false;
 }
 
-bool NbLauncher::parseConfigFile(const char* path) {
+bool NbLauncher::parseConfigFile(const char* path, const bool searchUserDir) {
     logMsg("parseConfigFile(%s)", path);
     FILE *file = fopen(path, "r");
     if (!file) {
@@ -474,7 +495,7 @@ bool NbLauncher::parseConfigFile(const char* path) {
         if (*str == '#') {
             continue;
         }
-        if (getOption(str, getDefUserDirOptName())) {
+        if (searchUserDir && getOption(str, getDefUserDirOptName())) {
              findUserDir(str);
              logMsg("User dir: %s", userDir.c_str());
         } else if (getOption(str, getDefCacheDirOptName())) {

nb/ide.launcher/windows/nblauncher.h

@@ -80,7 +80,7 @@ class NbLauncher {
     NbLauncher(const NbLauncher& orig);
     bool readClusterFile();
     bool parseArgs(int argc, char *argv[]);
-    bool parseConfigFile(const char* path);    
+    bool parseConfigFile(const char* path, const bool searchUserDir);
     bool getOption(char *&str, const char *opt);
     void addCluster(const char *cl);
     void addExtraClusters();