Remove /boot/common for good
* Remove support for the "common" installation location from packagefs, package kit, package daemon, package managers. * Rename the B_COMMON_*_DIRECTORY constants referring to writable directories to B_SYSTEM_*_DIRECTORY. * Remove/adjust the use of various B_COMMON_*_DIRECTORY constants. I'm sure some occurrence still remain. They can be adjusted when the remaining B_COMMON_*_DIRECTORY constants are removed.
This commit is contained in:
@@ -35,10 +35,7 @@ static const char* const kLongUsage =
|
||||
"Options:\n"
|
||||
" -H, --home\n"
|
||||
" Update the packages in the user's home directory. Default is to\n"
|
||||
" update in the common directory.\n"
|
||||
" -S, --system\n"
|
||||
" Update the packages in the system directory. Default is to\n"
|
||||
" update in the common directory.\n"
|
||||
" update in the system directory.\n"
|
||||
"\n";
|
||||
|
||||
|
||||
@@ -50,18 +47,17 @@ int
|
||||
UpdateCommand::Execute(int argc, const char* const* argv)
|
||||
{
|
||||
BPackageInstallationLocation location
|
||||
= B_PACKAGE_INSTALLATION_LOCATION_COMMON;
|
||||
= B_PACKAGE_INSTALLATION_LOCATION_SYSTEM;
|
||||
|
||||
while (true) {
|
||||
static struct option sLongOptions[] = {
|
||||
{ "help", no_argument, 0, 'h' },
|
||||
{ "home", no_argument, 0, 'H' },
|
||||
{ "system", no_argument, 0, 'S' },
|
||||
{ 0, 0, 0, 0 }
|
||||
};
|
||||
|
||||
opterr = 0; // don't print errors
|
||||
int c = getopt_long(argc, (char**)argv, "hHS", sLongOptions, NULL);
|
||||
int c = getopt_long(argc, (char**)argv, "hH", sLongOptions, NULL);
|
||||
if (c == -1)
|
||||
break;
|
||||
|
||||
@@ -74,10 +70,6 @@ UpdateCommand::Execute(int argc, const char* const* argv)
|
||||
location = B_PACKAGE_INSTALLATION_LOCATION_HOME;
|
||||
break;
|
||||
|
||||
case 'S':
|
||||
location = B_PACKAGE_INSTALLATION_LOCATION_SYSTEM;
|
||||
break;
|
||||
|
||||
default:
|
||||
PrintUsageAndExit(true);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user