patch-xbmc_Application_cpp 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. --- xbmc-12.2.orig/xbmc/Application.cpp 2013-05-03 07:57:41.000000000 +0200
  2. +++ xbmc-12.2/xbmc/Application.cpp 2013-10-10 18:43:17.000000000 +0200
  3. @@ -615,7 +615,7 @@ bool CApplication::Create()
  4. if (!CLog::Init(CSpecialProtocol::TranslatePath(g_settings.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_settings.m_logFolder).c_str());
  9. return false;
  10. }
  11. @@ -966,10 +966,13 @@ bool CApplication::InitDirectoriesLinux(
  12. userName = "root";
  13. CStdString userHome;
  14. + userHome = "/etc/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. @@ -1001,11 +1004,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);