diff options
| -rw-r--r-- | SBO-Lib/lib/SBO/Lib.pm | 7 | ||||
| -rw-r--r-- | man1/sbocheck.1 | 2 | ||||
| -rw-r--r-- | man1/sbocheck.1.bak~ | 32 | ||||
| -rw-r--r-- | man1/sboclean.1 | 2 | ||||
| -rw-r--r-- | man1/sboconfig.1 | 2 | ||||
| -rw-r--r-- | man1/sbofind.1 | 2 | ||||
| -rw-r--r-- | man1/sboinstall.1 | 2 | ||||
| -rw-r--r-- | man1/sboremove.1 | 2 | ||||
| -rw-r--r-- | man1/sbosnap.1 | 2 | ||||
| -rw-r--r-- | man1/sboupgrade.1 | 2 | ||||
| -rw-r--r-- | man5/sbotools.conf.5 | 2 | ||||
| -rw-r--r-- | slackbuild/sbotools/README | 6 | ||||
| -rw-r--r-- | slackbuild/sbotools/sbotools.SlackBuild | 7 | ||||
| -rw-r--r-- | slackbuild/sbotools/sbotools.info | 2 | ||||
| -rwxr-xr-x | t/test.t | 14 | ||||
| -rwxr-xr-x | tools/update_man_pages.sh | 8 | ||||
| -rwxr-xr-x | tools/update_versions.sh | 1 |
17 files changed, 42 insertions, 53 deletions
diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm index ed5f74c..fb343ec 100644 --- a/SBO-Lib/lib/SBO/Lib.pm +++ b/SBO-Lib/lib/SBO/Lib.pm @@ -14,7 +14,7 @@ use strict; use warnings FATAL => 'all'; package SBO::Lib; -our $VERSION = '1.7'; +our $VERSION = '1.8'; require Exporter; our @ISA = qw(Exporter); @@ -181,7 +181,10 @@ sub show_version() { # which is now not needed since this version drops support < 14.0 # but it's already future-proofed, so leave it. sub get_slack_version() { - my %supported = ('14.0' => '14.0'); + my %supported = ( + '14.0' => '14.0', + '14.1' => '14.1', + ); my ($fh, $exit) = open_read '/etc/slackware-version'; if ($exit) { warn $fh; diff --git a/man1/sbocheck.1 b/man1/sbocheck.1 index 68318c3..f0945e5 100644 --- a/man1/sbocheck.1 +++ b/man1/sbocheck.1 @@ -1,4 +1,4 @@ -.TH sbocheck 1 "Setting Orange, Bureaucracy 46, 3179 YOLD" "sbotools 1.7" dawnrazor.net +.TH sbocheck 1 "Sweetmorn, The Aftermath 39, 3179 YOLD" "sbotools 1.8" dawnrazor.net .SH NAME .P sbocheck - update a local slackbuilds.org tree and check for updates. diff --git a/man1/sbocheck.1.bak~ b/man1/sbocheck.1.bak~ deleted file mode 100644 index 68318c3..0000000 --- a/man1/sbocheck.1.bak~ +++ /dev/null @@ -1,32 +0,0 @@ -.TH sbocheck 1 "Setting Orange, Bureaucracy 46, 3179 YOLD" "sbotools 1.7" dawnrazor.net -.SH NAME -.P -sbocheck - update a local slackbuilds.org tree and check for updates. -.SH SYNAPSES -.P -sbocheck [-h|-v] -.SH DESCRIPTION -.P -sbocheck first updates a previously fetched copy of the slackbuilds.org tree (see sbosnap(1)) and then checks to see if any packages installed from slackbuilds.org have updates, and reports what it finds. -.SH OPTIONS -.P --h|--help -.RS -Show help information. -.RE -.P --v|--version -.RS -Show version information. -.RE -.SH BUGS -.P -None known, but there may be some. Please report any found to j@dawnrazor.net or xocel@iquidus.org; patches are always welcome. -.SH SEE ALSO -.P -sboclean(1), sboconfig(1), sbofind(1), sboinstall(1), sboremove(1), sbosnap(1), sboupgrade(1), sbotools.conf(5) -.SH AUTHORS -.P -Jacob Pipkin <j@dawnrazor.net> -.P -Luke Williams <xocel@iquidus.org> diff --git a/man1/sboclean.1 b/man1/sboclean.1 index 73fa6f5..01c0928 100644 --- a/man1/sboclean.1 +++ b/man1/sboclean.1 @@ -1,4 +1,4 @@ -.TH sboclean 1 "Setting Orange, Bureaucracy 46, 3179 YOLD" "sbotools 1.7" dawnrazor.net +.TH sboclean 1 "Sweetmorn, The Aftermath 39, 3179 YOLD" "sbotools 1.8" dawnrazor.net .SH NAME .P sboclean - clean files left around by sbotools. diff --git a/man1/sboconfig.1 b/man1/sboconfig.1 index 8d988c4..d1a0251 100644 --- a/man1/sboconfig.1 +++ b/man1/sboconfig.1 @@ -1,4 +1,4 @@ -.TH sboconfig 1 "Setting Orange, Bureaucracy 46, 3179 YOLD" "sbotools 1.7" dawnrazor.net +.TH sboconfig 1 "Sweetmorn, The Aftermath 39, 3179 YOLD" "sbotools 1.8" dawnrazor.net .SH NAME .P sboconfig - set sbotools configuration options. diff --git a/man1/sbofind.1 b/man1/sbofind.1 index da1c153..5a7b61a 100644 --- a/man1/sbofind.1 +++ b/man1/sbofind.1 @@ -1,4 +1,4 @@ -.TH sbofind 1 "Setting Orange, Bureaucracy 46, 3179 YOLD" "sbotools 1.7" dawnrazor.net +.TH sbofind 1 "Sweetmorn, The Aftermath 39, 3179 YOLD" "sbotools 1.8" dawnrazor.net .SH NAME .P sbofind - search slackbuilds.org tree for a given name diff --git a/man1/sboinstall.1 b/man1/sboinstall.1 index f7caad8..ca02e04 100644 --- a/man1/sboinstall.1 +++ b/man1/sboinstall.1 @@ -1,4 +1,4 @@ -.TH sboinstall 1 "Setting Orange, Bureaucracy 46, 3179 YOLD" "sbotools 1.7" dawnrazor.net +.TH sboinstall 1 "Sweetmorn, The Aftermath 39, 3179 YOLD" "sbotools 1.8" dawnrazor.net .SH NAME .P sboinstall - install slackbuilds diff --git a/man1/sboremove.1 b/man1/sboremove.1 index 2613f5a..af518e5 100644 --- a/man1/sboremove.1 +++ b/man1/sboremove.1 @@ -1,4 +1,4 @@ -.TH sboremove 1 "Setting Orange, Bureaucracy 46, 3179 YOLD" "sbotools 1.7" dawnrazor.net +.TH sboremove 1 "Sweetmorn, The Aftermath 39, 3179 YOLD" "sbotools 1.8" dawnrazor.net .SH NAME .P sboremove - remove packages installed from slackbuilds diff --git a/man1/sbosnap.1 b/man1/sbosnap.1 index ed3fc12..9fede9b 100644 --- a/man1/sbosnap.1 +++ b/man1/sbosnap.1 @@ -1,4 +1,4 @@ -.TH sbosnap 1 "Setting Orange, Bureaucracy 46, 3179 YOLD" "sbotools 1.7" dawnrazor.net +.TH sbosnap 1 "Sweetmorn, The Aftermath 39, 3179 YOLD" "sbotools 1.8" dawnrazor.net .SH NAME .P sbosnap - slackbuilds.org tree fetch and update command. diff --git a/man1/sboupgrade.1 b/man1/sboupgrade.1 index 2b24be6..c7b37eb 100644 --- a/man1/sboupgrade.1 +++ b/man1/sboupgrade.1 @@ -1,4 +1,4 @@ -.TH sboupgrade 1 "Setting Orange, Bureaucracy 46, 3179 YOLD" "sbotools 1.7" dawnrazor.net +.TH sboupgrade 1 "Sweetmorn, The Aftermath 39, 3179 YOLD" "sbotools 1.8" dawnrazor.net .SH NAME .P sboupgrade - install or upgrade slackbuilds diff --git a/man5/sbotools.conf.5 b/man5/sbotools.conf.5 index 4325a36..772ebdf 100644 --- a/man5/sbotools.conf.5 +++ b/man5/sbotools.conf.5 @@ -1,4 +1,4 @@ -.TH sbotools.conf 5 "Setting Orange, Bureaucracy 46, 3179 YOLD" "sbotools 1.7" dawnrazor.net +.TH sbotools.conf 5 "Sweetmorn, The Aftermath 39, 3179 YOLD" "sbotools 1.8" dawnrazor.net .SH NAME .P sbotools.conf - configuration file for sbotools commands. diff --git a/slackbuild/sbotools/README b/slackbuild/sbotools/README index 557db68..245f7dd 100644 --- a/slackbuild/sbotools/README +++ b/slackbuild/sbotools/README @@ -9,4 +9,10 @@ There are man pages for each of the sbo* commands, and more documentation, as well as online versions of the man pages, can be found at http://dawnrazor.net/sbotools/documentation/ +sbotools bundles the required Perl module Sort::Versions with it. This does +not interfere with a copy installed from the CPAN, or from slackbuilds.org. + +sbotools is written and maintained by d4wnr4z0r, xocel, and pink_mist; +we can be contacted in #sbotools on freenode. + http://dawnrazor.net/sbotools diff --git a/slackbuild/sbotools/sbotools.SlackBuild b/slackbuild/sbotools/sbotools.SlackBuild index 6f296e5..c64ebd9 100644 --- a/slackbuild/sbotools/sbotools.SlackBuild +++ b/slackbuild/sbotools/sbotools.SlackBuild @@ -5,7 +5,7 @@ # Licensed under the WTFPL <http://sam.zoy.org/wtfpl/COPYING> PRGNAM=sbotools -VERSION=${VERSION:-1.7} +VERSION=${VERSION:-1.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -31,12 +31,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o \ -perm 400 \) -exec chmod 644 {} \; +# we set INSTALLMAN3DIR=none to elide the Sort::Versions.3 man page so that we +# don't clobber one from perl-Sort-Versions or Sort::Versions. ( cd SBO-Lib perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=site \ INSTALLVENDORMAN1DIR=/usr/man/man1 \ - INSTALLVENDORMAN3DIR=/usr/man/man3 + INSTALLVENDORMAN3DIR=/usr/man/man3 \ + INSTALLMAN3DIR=none make make test make install DESTDIR=$PKG diff --git a/slackbuild/sbotools/sbotools.info b/slackbuild/sbotools/sbotools.info index 359e59f..f9a6daf 100644 --- a/slackbuild/sbotools/sbotools.info +++ b/slackbuild/sbotools/sbotools.info @@ -1,5 +1,5 @@ PRGNAM="sbotools" -VERSION="1.7" +VERSION="1.8" HOMEPAGE="http://dawnrazor.net/sbotools/" DOWNLOAD="http://dawnrazor.net/wp-content/uploads/2013/03/sbotools-1.6.tar.gz" MD5SUM="cc8a362cdbced4d2c166bc9edb673f4c" @@ -39,7 +39,13 @@ ok(defined $tempdir, '$tempdir is defined'); is(show_version, 1, 'show_version is good'); # get_slack_version test -is(get_slack_version, '14.0', 'get_slack_version is good'); +my $version = 0; +if (-f '/etc/slackware-version') { + $version = `awk '{print \$2}' /etc/slackware-version`; + chomp($version); +} +$version = '14.1' unless $version; +is(get_slack_version, $version, 'get_slack_version is good'); # chk_slackbuilds_txt tests is(chk_slackbuilds_txt, 1, 'chk_slackbuilds_txt is good'); @@ -182,7 +188,11 @@ ok(!(check_x32("$sbo_home/system/ifuse")), 'check_x32 false for not-32-bit-only ifuse'); # check_multilib tests -ok(check_multilib, 'check_multilib good'); +if (-x '/usr/sbin/convertpkg-compat32') { + ok(check_multilib, 'check_multilib good'); +} else { + ok(!check_multilib, 'check_multilib good'); +} # create_symlinks tests $downloads = get_sbo_downloads(LOCATION => "$sbo_home/system/wine", 32 => 1); diff --git a/tools/update_man_pages.sh b/tools/update_man_pages.sh index 6a57b4c..fe96125 100755 --- a/tools/update_man_pages.sh +++ b/tools/update_man_pages.sh @@ -78,12 +78,12 @@ update_date() { new_date=$(ddate +"%{%A, %B %d%}, %Y YOLD") - for i in $(ls man1); do - sed_file man1/$i "s/$old_date/$new_date/g" + for i in man1/*; do + sed_file $i "s/$old_date/$new_date/g" done - for i in $(ls man5); do - sed_file man5/$i "s/$old_date/$new_date/g" + for i in man5/*; do + sed_file $i "s/$old_date/$new_date/g" done if [[ "$?" == "0" ]]; then diff --git a/tools/update_versions.sh b/tools/update_versions.sh index 493a3fb..50e9464 100755 --- a/tools/update_versions.sh +++ b/tools/update_versions.sh @@ -28,7 +28,6 @@ update=" old_version=$(grep '^our $VERSION' SBO-Lib/lib/SBO/Lib.pm \ | grep -Eo '[0-9]+(\.[0-9]+){0,1}') -echo $old_version tmpfile=$(mktemp /tmp/XXXXXXXXXX) |