Updated settings folder handling when in single user mode (see #4428)

rtengine/profilestore.cc

@@ -121,11 +121,14 @@ void ProfileStore::_parseProfiles ()
     Glib::ustring p2 = options.getGlobalProfilePath();
     bool displayLevel0 = options.useBundledProfiles && !p1.empty() && !p2.empty() && p1 != p2;
 
-    Glib::ustring virtualPath ("${U}");
+    Glib::ustring virtualPath;
-    Glib::ustring currDir ("${U}");
+    Glib::ustring currDir;
-    parseDir (p1, virtualPath, currDir, 0, 0, displayLevel0);
+    if (!p1.empty()) {
-
+        virtualPath = "${U}";
-    if (displayLevel0) {
+        currDir = "${U}";
+        parseDir (p1, virtualPath, currDir, 0, 0, displayLevel0);
+    }
+    if (p1.empty() || displayLevel0) {
         virtualPath = "${G}";
         currDir = "${G}";
         parseDir (p2, virtualPath, currDir, 0, 0, displayLevel0);

rtgui/options.cc

@@ -107,17 +107,13 @@ void Options::updatePaths()
         }
 
         if (checkDirPath (profilePath, "Error: the specified user's profiles' path doesn't point to a directory or doesn't exist!\n")) {
-            if (multiUser) {
+            userProfilePath = profilePath;
-                userProfilePath = profilePath;
+            tmpPath = Glib::build_filename (argv0, "profiles");
-                tmpPath = Glib::build_filename (argv0, "profiles");
 
-                if (checkDirPath (tmpPath, "Error: the global's profiles' path doesn't point to a directory or doesn't exist!\n")) {
+            if (checkDirPath (tmpPath, "Error: the global's profiles' path doesn't point to a directory or doesn't exist!\n")) {
-                    if (userProfilePath != tmpPath) {
+                if (userProfilePath != tmpPath) {
-                        globalProfilePath = tmpPath;
+                    globalProfilePath = tmpPath;
-                    }
                 }
-            } else {
-                globalProfilePath = profilePath;
             }
         } else {
             tmpPath = Glib::build_filename (argv0, "profiles");
@@ -128,34 +124,24 @@ void Options::updatePaths()
         }
     } else {
         // relative paths
-        if (multiUser) {
+        tmpPath = Glib::build_filename (rtdir, profilePath);
-            tmpPath = Glib::build_filename (rtdir, profilePath);
+
+        if (!checkDirPath (tmpPath, "")) {
+            g_mkdir_with_parents (tmpPath.c_str (), 511);
 
             if (!checkDirPath (tmpPath, "")) {
-                g_mkdir_with_parents (tmpPath.c_str (), 511);
+                printf ("Error: user's profiles' directory \"%s\" creation failed\n", tmpPath.c_str());
-
-                if (!checkDirPath (tmpPath, "")) {
-                    printf ("Error: user's profiles' directory \"%s\" creation failed\n", tmpPath.c_str());
-                }
             }
+        }
 
-            if (checkDirPath (tmpPath, "Error: the specified user's profiles' path doesn't point to a directory!\n")) {
+        if (checkDirPath (tmpPath, "Error: the specified user's profiles' path doesn't point to a directory!\n")) {
-                userProfilePath = tmpPath;
+            userProfilePath = tmpPath;
-            }
+        }
 
-            tmpPath = Glib::build_filename (argv0, "profiles");
+        tmpPath = Glib::build_filename (argv0, "profiles");
 
-            if (checkDirPath (tmpPath, "Error: the specified user's profiles' path doesn't point to a directory or doesn't exist!\n")) {
+        if (checkDirPath (tmpPath, "Error: the specified user's profiles' path doesn't point to a directory or doesn't exist!\n")) {
-                globalProfilePath = tmpPath;
+            globalProfilePath = tmpPath;
-            }
-        } else {
-            // common directory
-            // directory name set in options is ignored, we use the default directory name
-            tmpPath = Glib::build_filename (argv0, "profiles");
-
-            if (checkDirPath (tmpPath, "Error: no global profiles' directory found!\n")) {
-                globalProfilePath = tmpPath;
-            }
         }
     }
 
@@ -2133,7 +2119,7 @@ void Options::load (bool lightweight)
     }
 
     // Set the cache folder in RT's base folder
-    cacheBaseDir = Glib::build_filename (argv0, "cache");
+    cacheBaseDir = Glib::build_filename (argv0, "mycache");
 
     // Read the global option file (the one located in the application's base folder)
     try {
@@ -2142,6 +2128,10 @@ void Options::load (bool lightweight)
         // ignore errors here
     }
 
+    if (!options.multiUser && path == nullptr) {
+        rtdir = Glib::build_filename (argv0, "mysettings");
+    }
+
     // Modify the path of the cache folder to the one provided in RT_CACHE environment variable
     path = g_getenv ("RT_CACHE");
 
@@ -2153,7 +2143,7 @@ void Options::load (bool lightweight)
             throw Error (msg);
         }
     }
-    // No environment variable provided, so falling back to the multi user mode, is enabled
+    // No environment variable provided, so falling back to the multi user mode, if enabled
     else if (options.multiUser) {
 #ifdef WIN32
         cacheBaseDir = Glib::build_filename (rtdir, "cache");
@@ -2162,25 +2152,24 @@ void Options::load (bool lightweight)
 #endif
     }
 
-    // Check if RT is installed in Multi-User mode
+    // Read the user option file (the one located somewhere in the user's home folder)
-    if (options.multiUser) {
+    // Those values supersets those of the global option file
-        // Read the user option file (the one located somewhere in the user's home folder)
+    try {
-        // Those values supersets those of the global option file
+        options.readFromFile (Glib::build_filename (rtdir, "options"));
-        try {
+    } catch (Options::Error &) {
-            options.readFromFile (Glib::build_filename (rtdir, "options"));
+        // If the local option file does not exist or is broken, and the local cache folder does not exist, recreate it
-        } catch (Options::Error &) {
+        if (!g_mkdir_with_parents (rtdir.c_str (), 511)) {
-            // If the local option file does not exist or is broken, and the local cache folder does not exist, recreate it
+            // Save the option file
-            if (!g_mkdir_with_parents (rtdir.c_str (), 511)) {
+            options.saveToFile (Glib::build_filename (rtdir, "options"));
-                // Save the option file
-                options.saveToFile (Glib::build_filename (rtdir, "options"));
-            }
         }
+    }
 
 #ifdef __APPLE__
+    if (options.multiUser) {
         // make sure .local/share exists on OS X so we don't get problems with recently-used.xbel
         g_mkdir_with_parents (g_get_user_data_dir(), 511);
-#endif
     }
+#endif
 
     if (options.rtSettings.verbose) {
         printf ("Cache directory (cacheBaseDir) = %s\n", cacheBaseDir.c_str());
@@ -2275,11 +2264,7 @@ void Options::load (bool lightweight)
 void Options::save ()
 {
 
-    if (!options.multiUser) {
+    options.saveToFile (Glib::build_filename (rtdir, "options"));
-        options.saveToFile (Glib::build_filename (argv0, "options"));
-    } else {
-        options.saveToFile (Glib::build_filename (rtdir, "options"));
-    }
 }
 
 /*