i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PackageInstaller: Install apps to non-packaged "apps" folder.

Browse Source 
Previously, the target folder was always unset, which meant one needed
to select a target folder manually. When running from a read-only media,
this would still be a problem (a TODO), so that instead of failing to install
the package, the user is simply prompted for a path.
The change means that together with rewriting old paths to packaged
locations to the non-packaged equivalents, just double clicking a PKG and
hitting "Install" will now work. Tested with Moho installer and
Gobe Productive.
This commit is contained in:
Stephan Aßmus
2014-02-16 12:19:16 +01:00
parent 735727da48
commit 4407020ba4
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/packageinstaller/PackageView.cpp
+4 -10
View File
@@ -563,26 +563,20 @@ PackageView::_InstallTypeChanged(int32 index)
if (profile->path_type == P_INSTALL_PATH) { if (profile->path_type == P_INSTALL_PATH) {
BMenuItem* item = NULL; BMenuItem* item = NULL;
if (find_directory(B_BEOS_APPS_DIRECTORY, &path) == B_OK) { if (find_directory(B_SYSTEM_NONPACKAGED_DIRECTORY, &path) == B_OK) {
dev_t device = dev_for_path(path.Path()); dev_t device = dev_for_path(path.Path());
if (volume.SetTo(device) == B_OK && !volume.IsReadOnly()) { if (volume.SetTo(device) == B_OK && !volume.IsReadOnly()
&& path.Append("apps") == B_OK) {
item = _AddDestinationMenuItem(path.Path(), volume.FreeBytes(), item = _AddDestinationMenuItem(path.Path(), volume.FreeBytes(),
path.Path()); path.Path());
} }
} }
if (find_directory(B_APPS_DIRECTORY, &path) == B_OK) {
dev_t device = dev_for_path(path.Path());
if (volume.SetTo(device) == B_OK && !volume.IsReadOnly()) {
item = _AddDestinationMenuItem(path.Path(),
volume.FreeBytes(), path.Path());
}
}
if (item != NULL) { if (item != NULL) {
item->SetMarked(true); item->SetMarked(true);
fCurrentPath.SetTo(path.Path()); fCurrentPath.SetTo(path.Path());
fDestination->AddSeparatorItem();
} }
fDestination->AddSeparatorItem();
_AddMenuItem(B_TRANSLATE("Other" B_UTF8_ELLIPSIS), _AddMenuItem(B_TRANSLATE("Other" B_UTF8_ELLIPSIS),
new BMessage(P_MSG_OPEN_PANEL), fDestination); new BMessage(P_MSG_OPEN_PANEL), fDestination);