Fix addon and configuration file paths

[minetest.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index f3a0ab07443fd726fd0df36a4727cacf04760b02..edf950635c25d3589f7075024f1c7456be18d895 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -56,9 +56,10 @@ void sigint_handler(int sig)
                dstream<<DTIME<<"INFO: sigint_handler(): "
                                <<"Ctrl-C pressed, shutting down."<<std::endl;
                
-               dstream<<DTIME<<"INFO: sigint_handler(): "
+               // Comment out for less clutter when testing scripts
+               /*dstream<<DTIME<<"INFO: sigint_handler(): "
                                <<"Printing debug stacks"<<std::endl;
-               debug_stacks_print();
+               debug_stacks_print();*/
 
                g_killed = true;
        }
@@ -91,9 +92,10 @@ void signal_handler_init(void)
                        {
                                dstream<<DTIME<<"INFO: event_handler(): "
                                                <<"Ctrl+C, Close Event, Logoff Event or Shutdown Event, shutting down."<<std::endl;
-                               dstream<<DTIME<<"INFO: event_handler(): "
+                               // Comment out for less clutter when testing scripts
+                               /*dstream<<DTIME<<"INFO: event_handler(): "
                                                <<"Printing debug stacks"<<std::endl;
-                               debug_stacks_print();
+                               debug_stacks_print();*/
 
                                g_killed = true;
                        }
@@ -122,8 +124,13 @@ void signal_handler_init(void)
        Path mangler
 */
 
-std::string path_data = ".." DIR_DELIM "data";
-std::string path_userdata = "..";
+std::string path_share = ".." DIR_DELIM "share";
+std::string path_user = ".." DIR_DELIM "user";
+
+std::string getDataPath(const char *subpath)
+{
+       return path_share + DIR_DELIM + subpath;
+}
 
 void pathRemoveFile(char *path, char delim)
 {
@@ -156,16 +163,13 @@ void initializePaths()
        char buf[buflen];
        DWORD len;
        
-       // Find path of executable and set path_data relative to it
+       // Find path of executable and set path_share relative to it
        len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
        assert(len < buflen);
        pathRemoveFile(buf, '\\');
 
-       // Use "./bin/../data"
-       path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
-               
-       // Use "./bin/.."
-       path_userdata = std::string(buf) + DIR_DELIM "..";
+       path_share = std::string(buf) + "\\..\\share";
+       path_user = std::string(buf) + "\\..\\user";
 
        /*
                Linux
@@ -180,11 +184,8 @@ void initializePaths()
        
        pathRemoveFile(buf, '/');
 
-       // Use "./bin/../data"
-       path_data = std::string(buf) + "/../data";
-               
-       // Use "./bin/../"
-       path_userdata = std::string(buf) + "/..";
+       path_share = std::string(buf) + "/../share";
+       path_user = std::string(buf) + "/../user";
        
        /*
                OS X
@@ -194,8 +195,8 @@ void initializePaths()
        //TODO: Get path of executable. This assumes working directory is bin/
        dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD"
                        <<std::endl;
-       path_data = std::string("../data");
-       path_userdata = std::string("..");
+       path_share = std::string("../share");
+       path_user = std::string("../user");
 
        #endif
 
@@ -217,19 +218,18 @@ void initializePaths()
        char buf[buflen];
        DWORD len;
        
-       // Find path of executable and set path_data relative to it
+       // Find path of executable and set path_share relative to it
        len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
        assert(len < buflen);
        pathRemoveFile(buf, '\\');
        
-       // Use "./bin/../data"
-       path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
-       //path_data = std::string(buf) + "/../share/" + PROJECT_NAME;
+       // Use ".\bin\..\share"
+       path_share = std::string(buf) + "\\..\\share";
                
        // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
        len = GetEnvironmentVariable("APPDATA", buf, buflen);
        assert(len < buflen);
-       path_userdata = std::string(buf) + DIR_DELIM + PROJECT_NAME;
+       path_user = std::string(buf) + DIR_DELIM + PROJECT_NAME;
 
        /*
                Linux
@@ -244,15 +244,15 @@ void initializePaths()
        
        pathRemoveFile(buf, '/');
 
-       path_data = std::string(buf) + "/../share/" + PROJECT_NAME;
-       //path_data = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
-       if (!fs::PathExists(path_data)) {
-               dstream<<"WARNING: data path " << path_data << " not found!";
-               path_data = std::string(buf) + "/../data";
-               dstream<<" Trying " << path_data << std::endl;
+       path_share = std::string(buf) + "/../share/" + PROJECT_NAME;
+       //path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+       if (!fs::PathExists(path_share)) {
+               dstream<<"WARNING: data path " << path_share << " not found!";
+               path_share = std::string(buf) + "/../data";
+               dstream<<" Trying " << path_share << std::endl;
        }
        
-       path_userdata = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
+       path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
 
        /*
                OS X
@@ -269,7 +269,7 @@ void initializePaths()
        {
                dstream<<"Bundle resource path: "<<path<<std::endl;
                //chdir(path);
-               path_data = std::string(path) + "/data";
+               path_share = std::string(path) + "/share";
        }
        else
     {
@@ -278,19 +278,19 @@ void initializePaths()
     }
     CFRelease(resources_url);
        
-       path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
+       path_user = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
 
        #elif defined(__FreeBSD__)
 
-       path_data = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
-       path_userdata = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
+       path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+       path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
     
        #endif
 
 #endif // RUN_IN_PLACE
 
-       dstream<<"path_data = "<<path_data<<std::endl;
-       dstream<<"path_userdata = "<<path_userdata<<std::endl;
+       dstream<<"path_share = "<<path_share<<std::endl;
+       dstream<<"path_user = "<<path_user<<std::endl;
 }
 
 } //namespace porting