From 41bfed9f20d1fad36afdc6781dab2007402c3711 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Mon, 10 Nov 2014 15:27:46 +0100
Subject: [PATCH] PackageInstaller: rewrite /boot/beos/system to /boot/system

Fixes #10603.
---
 src/apps/packageinstaller/PackageItem.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/apps/packageinstaller/PackageItem.cpp b/src/apps/packageinstaller/PackageItem.cpp
index 71dfe84263..ca547e6f98 100644
--- a/src/apps/packageinstaller/PackageItem.cpp
+++ b/src/apps/packageinstaller/PackageItem.cpp
@@ -187,6 +187,8 @@ PackageItem::InitPath(const char* path, BPath* destination)
 	} else if (fPathType == P_SYSTEM_PATH) {
 		if (gVerbose)
 			printf("InitPath - absolute: %s\n", fPath.String());
+		if (fPath == "")
+			fPath = "/";
 		ret = destination->SetTo(fPath.String());
 	} else {
 		if (gVerbose)
@@ -597,8 +599,11 @@ PackageScript::DoInstall(const char* path, ItemState* state)
 						// but it would be less save. For example, an app
 						// could have a folder named "config/be..." inside
 						// its installation folder.
-						// TODO: Use find_paths() or we are no better than 
+						// TODO: Use find_paths() or we are no better than
 						// these scripts.
+						script.ReplaceAll(
+							"/boot/beos/system/",
+							"/boot/system/");
 						script.ReplaceAll(
 							"~/config/be",
 							"~/config/settings/deskbar/menu");