aboutsummaryrefslogtreecommitdiff
path: root/SBO-Lib/lib/SBO
diff options
context:
space:
mode:
authorJacob Pipkin <j@dawnrazor.net>2012-09-22 01:50:59 -0500
committerJacob Pipkin <j@dawnrazor.net>2012-09-22 01:50:59 -0500
commited68a74124e1ce37c0e8c4e9c0b2db08eff4e336 (patch)
tree7c6254b9ca0edf0eed9c6e152ae4bda0f2809e38 /SBO-Lib/lib/SBO
parent1afa568ffe88a4ca012b7131971e7818e2d504a0 (diff)
downloadsbotools2-ed68a74124e1ce37c0e8c4e9c0b2db08eff4e336.tar.xz
fix bug where compat32 packages wouldn't install once built, fix typos and stuff
Diffstat (limited to 'SBO-Lib/lib/SBO')
-rw-r--r--SBO-Lib/lib/SBO/Lib.pm11
1 files changed, 4 insertions, 7 deletions
diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm
index cd78e1e..9af4ed4 100644
--- a/SBO-Lib/lib/SBO/Lib.pm
+++ b/SBO-Lib/lib/SBO/Lib.pm
@@ -119,10 +119,7 @@ sub show_version () {
# %supported maps what's in /etc/slackware-version to what's at SBo
sub get_slack_version () {
- my %supported = (
- '13.37.0' => '13.37',
- '14.0' => '13.37',
- );
+ my %supported = ('13.37.0' => '13.37');
my $fh = open_read '/etc/slackware-version';
chomp (my $line = <$fh>);
close $fh;
@@ -374,7 +371,7 @@ sub compare_md5s ($$) {
# for a given distfile, see whether or not it exists, and if so, if its md5sum
# matches the sbo's .info file
sub verify_distfile ($$) {
- exists $_[1] or script_error 'check_distfile requires two arguments.';
+ exists $_[1] or script_error 'verify_distfile requires two arguments.';
my ($link, $info_md5sum) = @_;
my $filename = get_filename_from_link $link;
return unless -d $distfiles;
@@ -586,7 +583,7 @@ sub perform_sbo (%) {
);
chdir $location, my $out = system $cmd;
revert_slackbuild "$location/$sbo.SlackBuild";
- die "$sbo.SlackBuild returned non-zero ext status\n" unless $out == 0;
+ die "$sbo.SlackBuild returned non-zero exit status\n" unless $out == 0;
my $pkg = get_pkg_name $tempfh;
my $src = get_src_dir $tempfh;
return $pkg, $src;
@@ -650,7 +647,7 @@ sub do_slackbuild (%) {
C32 => $args{COMPAT32},
X32 => $x32,
);
- do_convertpkg $pkg if $args{COMPAT32};
+ $pkg = do_convertpkg $pkg if $args{COMPAT32};
unlink $_ for @symlinks;
return $version, $pkg, $src;
}