diff options
| -rw-r--r-- | SBO-Lib/lib/SBO/Lib.pm | 7 | ||||
| -rw-r--r-- | slackbuild/sbotools/sbotools.SlackBuild | 2 | ||||
| -rw-r--r-- | slackbuild/sbotools/sbotools.info | 2 | ||||
| -rwxr-xr-x | t/test.t | 14 |
4 files changed, 19 insertions, 6 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/slackbuild/sbotools/sbotools.SlackBuild b/slackbuild/sbotools/sbotools.SlackBuild index 6f296e5..fe18684 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} 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); |