aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Guldstrand <andreas.guldstrand@gmail.com>2016-08-15 00:26:34 +0200
committerAndreas Guldstrand <andreas.guldstrand@gmail.com>2016-08-15 00:26:34 +0200
commitfb84f53326c46700e8fc5c383f0a7a3425177c58 (patch)
treed9a4ed8ad97e9dff0d5c39d85d6e7a00691bece6
parent96ebe3dceeca539856a16968e4a8630ebc930d9d (diff)
downloadsbotools2-fb84f53326c46700e8fc5c383f0a7a3425177c58.tar.xz
sbo*, man*, SBO::Lib: trailing whitespace fixes
-rw-r--r--SBO-Lib/lib/SBO/Lib.pm4
-rw-r--r--man1/sboremove.12
-rw-r--r--man5/sbotools.conf.52
-rwxr-xr-xsboclean2
-rwxr-xr-xsbofind2
-rwxr-xr-xsboremove18
-rwxr-xr-xsboupgrade2
7 files changed, 16 insertions, 16 deletions
diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm
index 9443419..11fccfd 100644
--- a/SBO-Lib/lib/SBO/Lib.pm
+++ b/SBO-Lib/lib/SBO/Lib.pm
@@ -424,7 +424,7 @@ sub slackbuilds_or_fetch {
return 1;
}
-# pull an array of hashes, each hash containing the name and version of a
+# pull an array of hashes, each hash containing the name and version of a
# package currently installed. Gets filtered using STD, SBO or ALL.
sub get_installed_packages {
script_error('get_installed_packages requires an argument.') unless @_ == 1;
@@ -665,7 +665,7 @@ sub get_available_updates {
return \@updates;
}
-# get downloads and md5sums from an sbo's .info file, first
+# get downloads and md5sums from an sbo's .info file, first
# checking for x86_64-specific info if we are told to
sub get_download_info {
my %args = (
diff --git a/man1/sboremove.1 b/man1/sboremove.1
index bfafa44..55c7a86 100644
--- a/man1/sboremove.1
+++ b/man1/sboremove.1
@@ -7,7 +7,7 @@ sboremove - remove packages installed from slackbuilds
sboremove [-h|-v] [-a] sbo_name
.SH DESCRIPTION
.P
-sboremove is used to remove packages installed from slackbuilds. It pulls the list of requirements from the .info file for any specified slackbuild. If such a list exists, sboremove will look to see whether or not those requirements are installed. Those that are will then be checked to see whether they are requirements of other packages also installed. If a package is no longer required, or the -a flag is specified sboremove will ask whether or not it should also remove it from the system.
+sboremove is used to remove packages installed from slackbuilds. It pulls the list of requirements from the .info file for any specified slackbuild. If such a list exists, sboremove will look to see whether or not those requirements are installed. Those that are will then be checked to see whether they are requirements of other packages also installed. If a package is no longer required, or the -a flag is specified sboremove will ask whether or not it should also remove it from the system.
.SH OPTIONS
.P
-h|--help
diff --git a/man5/sbotools.conf.5 b/man5/sbotools.conf.5
index 06410bf..d428e7b 100644
--- a/man5/sbotools.conf.5
+++ b/man5/sbotools.conf.5
@@ -4,7 +4,7 @@
sbotools.conf - configuration file for sbotools commands.
.SH DESCRIPTION
.P
-This file, location at /etc/sbotools/sbotools.conf, contains KEY=VALUE configuration parameters, and is read by all of the sbotools commands.
+This file, location at /etc/sbotools/sbotools.conf, contains KEY=VALUE configuration parameters, and is read by all of the sbotools commands.
.P
The current configuration keys are as follows:
.P
diff --git a/sboclean b/sboclean
index 3b7792e..82f06e4 100755
--- a/sboclean
+++ b/sboclean
@@ -53,7 +53,7 @@ GetOptions(
if ($help) { show_usage(); exit 0 }
if ($vers) { show_version(); exit 0 }
-usage_error("You must specify at least one of -d or -w.") unless
+usage_error("You must specify at least one of -d or -w.") unless
($clean_dist || $clean_work);
sub rm_full {
diff --git a/sbofind b/sbofind
index 92054dd..3702e6e 100755
--- a/sbofind
+++ b/sbofind
@@ -142,7 +142,7 @@ sub get_file_contents {
return "\n" . indent 6, $contents;
}
-# get build queue and return it as a single line.
+# get build queue and return it as a single line.
sub show_build_queue {
script_error('show_build_queue requires an argument.') unless @_ == 1;
my $queue = get_build_queue([shift], {});
diff --git a/sboremove b/sboremove
index be1215f..0317ba1 100755
--- a/sboremove
+++ b/sboremove
@@ -66,7 +66,7 @@ for my $sbo (@ARGV) {
}
exit 1 unless @sbos;
-# Create full queue.
+# Create full queue.
my ($remove_queue, %warnings);
for my $sbo (@sbos) {
my $queue = get_build_queue([$sbo], \%warnings);
@@ -77,7 +77,7 @@ for my $sbo (@sbos) {
# Determine required by for all installed sbo's
my (%required_by, @confirmed);
-# populates the required_by hash
+# populates the required_by hash
sub get_reverse_reqs {
my $installed = shift;
INST: for my $inst (@$installed) {
@@ -85,7 +85,7 @@ sub get_reverse_reqs {
REQ: for my $req (@$require) {
next REQ if $req eq '%README%';
push @{ $required_by{$req} }, $inst if in($req => @$installed);
- }
+ }
}
return 1;
}
@@ -110,7 +110,7 @@ sub confirm_remove {
return 1;
}
-# Check if packages in queue are actually installed on system
+# Check if packages in queue are actually installed on system
my @temp;
for my $sbo (@$remove_queue) {
push @temp, $sbo if $inst_names{$sbo};
@@ -134,7 +134,7 @@ FIRST: for my $remove (@$remove_queue) {
$needed = 1 unless $sbos{$remove};
# still needed, unless required_by is already confirmed for removal or
# the sbo in question was cli-specified.
- }
+ }
if ( $needed ) {
next FIRST unless $alwaysask; #ignore sbo and skip prompt
print "$remove : required by " . join(' ', @$required_by) . "\n";
@@ -143,7 +143,7 @@ FIRST: for my $remove (@$remove_queue) {
}
# Check for %README% value and inform user.
- if ( $warnings{$remove} ) {
+ if ( $warnings{$remove} ) {
say "It is recommended that you view the README before continuing.";
print "Display README now? [y]: ";
if (<STDIN> =~ /^[Yy\n]/) {
@@ -160,8 +160,8 @@ FIRST: for my $remove (@$remove_queue) {
my $default = 'y';
my $regex = "[Yy\n]";
if ($needed) {
- $default = 'n';
- $regex = "[Yy]";
+ $default = 'n';
+ $regex = "[Yy]";
}
# Ask user to confirm removal
print "Remove $remove? [$default]: ";
@@ -171,7 +171,7 @@ FIRST: for my $remove (@$remove_queue) {
} else {
say " * Ignoring\n";
}
-}
+}
CONFIRMED:
# Show remove queue
diff --git a/sboupgrade b/sboupgrade
index 6ac6250..234ed53 100755
--- a/sboupgrade
+++ b/sboupgrade
@@ -189,7 +189,7 @@ FIRST: for my $sbo (@$upgrade_queue) {
push(@temp_queue, $sbo);
$commands{$sbo} = $cmds;
$options{$sbo} = $opts;
- say "$sbo added to upgrade queue.";
+ say "$sbo added to upgrade queue.";
} else {
push(@temp_queue, $sbo);
say "\n$sbo added to upgrade queue.";