patch-xbmc_Application_cpp 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. --- xbmc-20140401.orig/xbmc/Application.cpp 2014-03-24 15:52:54.000000000 +0100
  2. +++ xbmc-20140401/xbmc/Application.cpp 2014-04-01 21:05:39.113975490 +0200
  3. @@ -682,7 +682,7 @@ bool CApplication::Create()
  4. if (!CLog::Init(CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str()))
  5. {
  6. - fprintf(stderr,"Could not init logging classes. Permission errors on ~/.xbmc (%s)\n",
  7. + fprintf(stderr,"Could not init logging classes. Permission errors on %s\n",
  8. CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str());
  9. return false;
  10. }
  11. @@ -1085,10 +1085,13 @@ bool CApplication::InitDirectoriesLinux(
  12. userName = "root";
  13. CStdString userHome;
  14. + userHome = "/data/xbmc";
  15. +/*
  16. if (getenv("HOME"))
  17. userHome = getenv("HOME");
  18. else
  19. userHome = "/root";
  20. +*/
  21. CStdString xbmcBinPath, xbmcPath;
  22. CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME");
  23. @@ -1120,11 +1123,11 @@ bool CApplication::InitDirectoriesLinux(
  24. // map our special drives
  25. CSpecialProtocol::SetXBMCBinPath(xbmcBinPath);
  26. CSpecialProtocol::SetXBMCPath(xbmcPath);
  27. - CSpecialProtocol::SetHomePath(userHome + "/.xbmc");
  28. - CSpecialProtocol::SetMasterProfilePath(userHome + "/.xbmc/userdata");
  29. + CSpecialProtocol::SetHomePath(userHome);
  30. + CSpecialProtocol::SetMasterProfilePath(userHome + "/userdata");
  31. - CStdString strTempPath = userHome;
  32. - strTempPath = URIUtils::AddFileToFolder(strTempPath, ".xbmc/temp");
  33. + CStdString strTempPath = "/tmp";
  34. + strTempPath = URIUtils::AddFileToFolder(strTempPath, "/xbmc");
  35. if (getenv("XBMC_TEMP"))
  36. strTempPath = getenv("XBMC_TEMP");
  37. CSpecialProtocol::SetTempPath(strTempPath);