aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Guldstrand <andreas.guldstrand@gmail.com>2015-12-05 12:59:37 +0100
committerAndreas Guldstrand <andreas.guldstrand@gmail.com>2015-12-05 12:59:37 +0100
commit90c7e9fb01615e21c20c0aca0b3ecf62b73d3c49 (patch)
tree55f75cc7b856ab10fac3dea4826ae24974246f4f
parent89fa913f7cb2dcb5038dfb1db19f54fd99ff2f75 (diff)
downloadsbotools2-90c7e9fb01615e21c20c0aca0b3ecf62b73d3c49.tar.xz
Change sboconfig flag for local overrides to -o
Because -l is already in use.
-rw-r--r--man1/sboconfig.12
-rwxr-xr-xsboconfig8
2 files changed, 5 insertions, 5 deletions
diff --git a/man1/sboconfig.1 b/man1/sboconfig.1
index a502a13..5158c16 100644
--- a/man1/sboconfig.1
+++ b/man1/sboconfig.1
@@ -50,7 +50,7 @@ PKG_DIR: If set to a path, packages will be stored at the given location after b
SBO_HOME: If set to a path, this is where the slackbuilds.org tree will live; by default, /usr/sbo will be used. If the tree should live elsewhere, this option can be set to the path where the tree should live. Note that if you set this option after fetching the tree to a different location (such as the default), you will need to fetch the tree again.
.RE
.P
--l|--local-overrides (FALSE|/path)
+-o|--local-overrides (FALSE|/path)
.RS
LOCAL_OVERRIDES: If set to a path, any directory name under that path that matches a slackbuild name will be used instead of anything found on SBo. This will even work if it isn't on SBo at all. It still requires all the usual files present in an SBo directory such as README, name.info, and name.SlackBuild.
.RE
diff --git a/sboconfig b/sboconfig
index 0a42c61..90e30b6 100755
--- a/sboconfig
+++ b/sboconfig
@@ -41,7 +41,7 @@ Config options (defaults shown):
PKG_DIR: set a directory to store packages in.
-s|--sbo-home /usr/sbo:
SBO_HOME: set the SBo directory.
- -l|--local-overrides FALSE:
+ -o|--local-overrides FALSE:
LOCAL_OVERRIDES: a directory containing local overrides.
-V|--slackware-version FALSE:
SLACKWARE_VERSION: use the SBo repository for this version.
@@ -53,7 +53,7 @@ my %options;
GetOptions(\%options, 'help|h', 'version|v', 'list|l', 'noclean|c=s',
'distclean|d=s', 'jobs|j=s', 'pkg-dir|p=s', 'sbo-home|s=s',
- 'local-overrides|l=s', 'slackware-version|V=s');
+ 'local-overrides|o=s', 'slackware-version|V=s');
show_usage() and exit 0 if exists $options{help};
show_version() and exit 0 if exists $options{version};
@@ -74,7 +74,7 @@ my %params = (
JOBS => 'j|--jobs',
PKG_DIR => 'p|--pkg-dir',
SBO_HOME => 's|--sbo-home',
- LOCAL_OVERRIDES => 'l|--local-overrides',
+ LOCAL_OVERRIDES => 'o|--local-overrides',
SLACKWARE_VERSION => 'V|--slackware-version',
);
@@ -111,7 +111,7 @@ if (exists $changes{SBO_HOME}) {
usage_error("$warn -s") unless $changes{SBO_HOME} =~ qr#^/#;
}
if (exists $changes{LOCAL_OVERRIDES}) {
- usage_error("$warn -l") unless $changes{LOCAL_OVERRIDES} =~ qr#^(/|FALSE$)#;
+ usage_error("$warn -o") unless $changes{LOCAL_OVERRIDES} =~ qr#^(/|FALSE$)#;
}
if (exists $changes{SLACKWARE_VERSION}) {
usage_error("$warn -V") unless $changes{SLACKWARE_VERSION} =~ m/^(\d+\.\d+|FALSE)$/;