commit 673935356f387529cae25ab791bc88e00fd58c9b
parent 72afb8322ace13da8b3598ac9e5a543382b207d6
Author: Jacob Pipkin <j@dawnrazor.net>
Date: Sat, 1 Sep 2012 12:49:24 -0500
updates man pages for 0.8
Diffstat:
9 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/man1/sbocheck.1 b/man1/sbocheck.1
@@ -1,4 +1,4 @@
-.TH sbocheck 1 "Setting Orange, the 34th day of Confusion in the YOLD 3178" "sbotools 0.7 fnord" dawnrazor.net
+.TH sbocheck 1 "Prickle-Prickle, the 25th day of Bureaucracy in the YOLD 3178" "sbotools 0.8 fnord" dawnrazor.net
.SH NAME
.P
sbocheck - update a local slackbuilds.org tree and check for updates.
@@ -16,7 +16,7 @@ Show sbotools version information.
.RE
.SH BUGS
.P
-None known, but there may be some. Please report any found to j@dawnrazor.net; patches are always welcome. In the future sbotools may exist in a public git repository and this section may change to reflect that.
+None known, but there may be some. Please report any found to j@dawnrazor.net; patches are always welcome.
.SH SEE ALSO
.P
sboclean(1), sboconfig(1), sbofind(1), sboinstall(1), sboupgrade(1), sbosnap(1), sbotools.conf(5)
diff --git a/man1/sboclean.1 b/man1/sboclean.1
@@ -1,4 +1,4 @@
-.TH sboclean 1 "Setting Orange, the 34th day of Confusion in the YOLD 3178" "sbotools 0.7 fnord" dawnrazor.net
+.TH sboclean 1 "Prickle-Prickle, the 25th day of Bureaucracy in the YOLD 3178" "sbotools 0.8 fnord" dawnrazor.net
.SH NAME
.P
sboclean - clean files left around by sbotools.
@@ -35,7 +35,7 @@ Clean working directories, located under /tmp/SBo.
Be interactive; sboclean will ask for confirmation for each item which it think should be removed.
.SH BUGS
.P
-None known, but there may be some. Please report any found to j@dawnrazor.net; patches are always welcome. In the future sbotools may exist in a public git repository and this section may change to reflect that.
+None known, but there may be some. Please report any found to j@dawnrazor.net; patches are always welcome.
.SH SEE ALSO
.P
sbocheck(1), sboconfig(1), sbofind(1), sboinstall(1), sboupgrade(1), sbosnap(1), sbotools.conf(5)
diff --git a/man1/sboconfig.1 b/man1/sboconfig.1
@@ -1,4 +1,4 @@
-.TH sboconfig 1 "Setting Orange, the 34th day of Confusion in the YOLD 3178" "sbotools 0.7 fnord" dawnrazor.net
+.TH sboconfig 1 "Prickle-Prickle, the 25th day of Bureaucracy in the YOLD 3178" "sbotools 0.8 fnord" dawnrazor.net
.SH NAME
.P
sboconfig - set sbotools configuration options.
@@ -7,7 +7,7 @@ sboconfig - set sbotools configuration options.
sboconfig [-h] [-l] [-d TRUE|FALSE] [-j #|FALSE] [-c TRUE|FALSE] [-p /path|FALSE] [-s /path|/usr/sbo] [-v]
.SH DESCRIPTION
.P
-sboconfig is a front-end for managing sbotools configuration options. The sbotools.conf(5) file can also be manually edited; any fields not relevant to sbotools configuration will be ignored. Note that more options may be added in the future, so you should not add garbage to the sbotools.conf(5) file.
+sboconfig is a front-end for managing sbotools configuration options. The sbotools.conf(5) file can also be manually edited; any fields not relevant to sbotools configuration will be ignored.
.SH OPTIONS
.P
-h
@@ -17,7 +17,7 @@ Show help information.
.P
-l
.RS
-List out current configuration options, including unmodified default configuration options (meaning that if a given option is not set in the sbotools.conf(5) file, the default will be shown for that option).
+List out current configuration options, including unmodified default configuration options (meaning that if a given option is not set in the sbotools.conf(5) file, the default will be shown for that option). Also shows the flag to sboconfig used to set each option.
.RE
.P
-d (TRUE|FALSE)
@@ -51,7 +51,7 @@ Show sbotools version information.
.RE
.SH BUGS
.P
-None known, but there may be some. Please report any found to j@dawnrazor.net; patches are always welcome. In the future sbotools may exist in a public git repository and this section may change to reflect that.
+None known, but there may be some. Please report any found to j@dawnrazor.net; patches are always welcome.
.SH SEE ALSO
.P
sbocheck(1), sboclean(1), sbofind(1), sboinstall(1), sboupgrade(1), sbosnap(1), sbotools.conf(5)
diff --git a/man1/sbofind.1 b/man1/sbofind.1
@@ -1,4 +1,4 @@
-.TH sbofind 1 "Setting Orange, the 34th day of Confusion in the YOLD 3178" "sbotools 0.7 fnord" dawnrazor.net
+.TH sbofind 1 "Prickle-Prickle, the 25th day of Bureaucracy in the YOLD 3178" "sbotools 0.8 fnord" dawnrazor.net
.SH NAME
.P
sbofind - search slackbuilds.org tree for a given name
@@ -31,7 +31,7 @@ Show the contents of the README file for each slackbuild found.
.RE
.SH BUGS
.P
-None known, but there may be some. Please report any found to j@dawnrazor.net; patches are always welcome. In the future sbotools may exist in a public git repository and this section may change to reflect that.
+None known, but there may be some. Please report any found to j@dawnrazor.net; patches are always welcome.
.SH SEE ALSO
.P
sbocheck(1), sboclean(1), sboconfig(1), sboinstall(1), sboupgrade(1), sbosnap(1), sbotools.conf(5)
diff --git a/man1/sboinstall.1 b/man1/sboinstall.1
@@ -1,4 +1,4 @@
-.TH sboinstall 1 "Setting Orange, the 34th day of Confusion in the YOLD 3178" "sbotools 0.7 fnord" dawnrazor.net
+.TH sboinstall 1 "Prickle-Prickle, the 25th day of Bureaucracy in the YOLD 3178" "sbotools 0.8 fnord" dawnrazor.net
.SH NAME
.P
sboinstall - install slackbuilds
diff --git a/man1/sbosnap.1 b/man1/sbosnap.1
@@ -1,4 +1,4 @@
-.TH sbosnap 1 "Setting Orange, the 34th day of Confusion in the YOLD 3178" "sbotools 0.7 fnord" dawnrazor.net
+.TH sbosnap 1 "Prickle-Prickle, the 25th day of Bureaucracy in the YOLD 3178" "sbotools 0.8 fnord" dawnrazor.net
.SH NAME
.P
sbosnap - slackbuilds.org tree fetch and update command.
@@ -17,7 +17,7 @@ Download a local copy of the slackbuilds.org tree. The copy will be downloaded t
.P
update
.RS
-Update an previously fetch'd copy of the slackbuilds.org tree.
+Update a previously fetch'd copy of the slackbuilds.org tree.
.RE
.P
-v
@@ -27,7 +27,7 @@ Show sbotools version information.
.SH BUGS
.P
-None known, but there may be some. Please report any found to j@dawnrazor.net; patches are always welcome. In the future sbotools may exist in a public git repository and this section may change to reflect that.
+None known, but there may be some. Please report any found to j@dawnrazor.net; patches are always welcome.
.SH SEE ALSO
.P
sbocheck(1), sboclean(1), sboconfig(1), sbofind(1), sboinstall(1), sboupgrade(1), sbotools.conf(5)
diff --git a/man1/sboupgrade.1 b/man1/sboupgrade.1
@@ -1,4 +1,4 @@
-.TH sboupgrade 1 "Setting Orange, the 34th day of Confusion in the YOLD 3178" "sbotools 0.7 fnord" dawnrazor.net
+.TH sboupgrade 1 "Prickle-Prickle, the 25th day of Bureaucracy in the YOLD 3178" "sbotools 0.8 fnord" dawnrazor.net
.SH NAME
.P
sboupgrade - install or upgrade slackbuilds
diff --git a/man5/sbotools.conf.5 b/man5/sbotools.conf.5
@@ -1,4 +1,4 @@
-.TH sbotools.conf 5 "Setting Orange, the 34th day of Confusion in the YOLD 3178" "sbotools 0.7 fnord" dawnrazor.net
+.TH sbotools.conf 5 "Prickle-Prickle, the 25th day of Bureaucracy in the YOLD 3178" "sbotools 0.8 fnord" dawnrazor.net
.SH NAME
.P
sbotools.conf - configuration file for sbotools commands.
diff --git a/sboconfig b/sboconfig
@@ -69,14 +69,28 @@ if (exists $options{l}) {
show_usage and exit 0 unless %options;
-# setup what's being changed.
+# setup what's being changed, sanity check.
my %changes;
while (my ($key, $value) = each %valid_confs) {
$changes{$value} = $options{$key} if exists $options{$key};
}
+
+my $die = "You have provided an invalid parameter for";
+
+if (exists $changes{NOCLEAN}) {
+ die "$die -c\n" unless $changes{NOCLEAN} =~ /^(TRUE|FALSE)$/;
+}
+if (exists $changes{DISTCLEAN}) {
+ die "$die -d\n" unless $changes{DISTCLEAN} =~ /^(TRUE|FALSE)$/;
+}
if (exists $changes{JOBS}) {
- die "You have provided an invalid parameter for -j\n" unless
- ($changes{JOBS} =~ /^\d+$/ || $changes{JOBS} eq 'FALSE');
+ die "$die -j\n" unless $changes{JOBS} =~ /^(\d+|FALSE)$/;
+}
+if (exists $changes{PKG_DIR}) {
+ die "$die -p\n" unless $changes{PKG_DIR} =~ qr#^(/|FALSE$)#;
+}
+if (exists $changes{SBO_HOME}) {
+ die "$die -s\n" unless $changes{SBO_HOME} =~ qr#^/#;
}
# safely modify our conf file; write its contents to a temp file, modify the
