Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PackageInstaller: Dynamically replace /boot/system with the system non-packaged dir, same with ~/config

Browse Source
This commit is contained in:
Puck Meerburg 2014-01-27 19:08:06 +00:00 committed by Adrien Destugues
parent 7c1acc8968
commit c45fe1f8f7
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/apps/packageinstaller/PackageItem.cpp
View File

@ -15,6 +15,7 @@
#include <ByteOrder.h> #include <ByteOrder.h>
#include <Catalog.h> #include <Catalog.h>
#include <Directory.h> #include <Directory.h>
#include <FindDirectory.h>
#include <fs_info.h> #include <fs_info.h>
#include <Locale.h> #include <Locale.h>
#include <NodeInfo.h> #include <NodeInfo.h>
@ -204,6 +205,25 @@ PackageItem::InitPath(const char *path, BPath *destination)
ret = destination->SetTo(mountPoint.Path(), fPath.String()); ret = destination->SetTo(mountPoint.Path(), fPath.String());
} }
BPath systemNonPackagedDir;
find_directory(B_SYSTEM_NONPACKAGED_DIRECTORY, &systemNonPackagedDir);
BPath userNonPackagedDir;
find_directory(B_USER_NONPACKAGED_DIRECTORY, &userNonPackagedDir);
BString pathString(destination->Path());
// Hardcoded paths, the .pkg files hardcode this to the same
if (pathString.FindFirst("/boot/system") == 0 && pathString.FindFirst("non-packaged") == B_ERROR) {
pathString.Replace("/boot/system", systemNonPackagedDir.Path(), 1);
}
if (pathString.FindFirst("/boot/home/config") == 0 && pathString.FindFirst("non-packaged") == B_ERROR) {
pathString.Replace("/boot/home/config", userNonPackagedDir.Path(), 1);
}
destination->SetTo(pathString.String());
return ret; return ret;
} }