Browse Source

Removed a return from T_indexer, may have gotten there unintentionally.

master
freesource 23 years ago
parent
commit
765a51443b
  1. 98
      SWIM/Indexer.pm

98
SWIM/Indexer.pm

@ -39,6 +39,7 @@ sub T_indexer {
my %commands = %$commands; my %commands = %$commands;
foreach (@$alot) { foreach (@$alot) {
$argument = $_; $argument = $_;
if ($commands->{"scripts"} || if ($commands->{"scripts"} ||
@ -64,8 +65,8 @@ sub T_indexer {
file(\%commands); file(\%commands);
} }
print "\n"; print "\n";
return;
} }
} # end sub T_indexer } # end sub T_indexer
@ -174,11 +175,17 @@ sub c_indexer {
foreach (@$alot) { foreach (@$alot) {
$argument = $_; $argument = $_;
if (conf(\%commands) ne 0) { if (conf(\%commands) ne 0) {
if ($commands->{"T"}) { if ($commands->{"T"}) {
# covers first argument, but not the rest. # covers first argument, but not the rest.
if ($commands->{"scripts"} || $commands->{"preinst"} || if (
$commands->{"postinst"} || $commands->{"prerm"} || $commands->{"scripts"} ||
$commands->{"postrm"} || $commands->{"config"} || $commands->{"templates"}) { $commands->{"preinst"} ||
$commands->{"postinst"} ||
$commands->{"prerm"} ||
$commands->{"postrm"} ||
$commands->{"config"} ||
$commands->{"templates"}) {
scripts(\%commands); scripts(\%commands);
} }
menu(\%commands) if $commands->{"menu"} || $commands->{"m"}; menu(\%commands) if $commands->{"menu"} || $commands->{"m"};
@ -190,7 +197,14 @@ sub c_indexer {
print conf(\%commands) if !$commands->{"md5sum"}; print conf(\%commands) if !$commands->{"md5sum"};
file(\%commands); file(\%commands);
#file(\%commands) if $commands->{"md5sum"}; #file(\%commands) if $commands->{"md5sum"};
if (($commands->{"c"} && (!$commands->{"d"} || !$commands->{"l"}))) {
if (
($commands->{"c"} &&
(!$commands->{"d"} ||
!$commands->{"l"}))
) {
print "\n"; print "\n";
} }
$arg_save = $argument; $arg_save = $argument;
@ -199,9 +213,15 @@ sub c_indexer {
elsif (which_character(\%commands)) { elsif (which_character(\%commands)) {
my %store_commands = %commands; my %store_commands = %commands;
$argument = $_; $argument = $_;
if ($commands->{"scripts"} || $commands->{"preinst"} || if (
$commands->{"postinst"} || $commands->{"prerm"} || $commands->{"scripts"} ||
$commands->{"postrm"} || $commands->{"config"} || $commands->{"templates"}) { $commands->{"preinst"} ||
$commands->{"postinst"} ||
$commands->{"prerm"} ||
$commands->{"postrm"} ||
$commands->{"config"} ||
$commands->{"templates"}
) {
scripts(\%commands); scripts(\%commands);
} }
menu(\%commands) if $commands->{"menu"} || $commands->{"m"}; menu(\%commands) if $commands->{"menu"} || $commands->{"m"};
@ -215,7 +235,13 @@ sub c_indexer {
print conf(\%commands) if !$commands->{"md5sum"}; print conf(\%commands) if !$commands->{"md5sum"};
file(\%commands); file(\%commands);
#file(\%commands) if $commands->{"md5sum"}; #file(\%commands) if $commands->{"md5sum"};
if (($commands->{"c"} && (!$commands->{"d"} || !$commands->{"l"}))) { if (
($commands->{"c"} &&
(!$commands->{"d"} ||
!$commands->{"l"}))
) {
print "\n"; print "\n";
} }
%commands = %store_commands; %commands = %store_commands;
@ -225,8 +251,13 @@ sub c_indexer {
# no Ts. # no Ts.
else { else {
if ($commands->{"scripts"} || $commands->{"preinst"} || if (
$commands->{"postinst"} || $commands->{"config"} || $commands->{"templates"} || $commands->{"prerm"} || $commands->{"scripts"} ||
$commands->{"preinst"} ||
$commands->{"postinst"} ||
$commands->{"config"} ||
$commands->{"templates"} ||
$commands->{"prerm"} ||
$commands->{"postrm"}) { $commands->{"postrm"}) {
scripts(\%commands); scripts(\%commands);
} }
@ -260,12 +291,18 @@ sub c_indexer {
elsif (conf(\%commands) eq 0) { elsif (conf(\%commands) eq 0) {
if ($commands->{"T"}) { if ($commands->{"T"}) {
$argument = $_; $argument = $_;
if ($commands->{"scripts"} || $commands->{"preinst"} || if (
$commands->{"postinst"} || $commands->{"prerm"} || $commands->{"scripts"} ||
$commands->{"postrm"} || $commands->{"config"} || $commands->{"templates"}) { $commands->{"preinst"} ||
$commands->{"postinst"} ||
$commands->{"prerm"} ||
$commands->{"postrm"} ||
$commands->{"config"} ||
$commands->{"templates"}) {
scripts(\%commands); scripts(\%commands);
} }
menu(\%commands) if $commands->{"menu"} || $commands->{"m"}; menu(\%commands) if $commands->{"menu"} ||
$commands->{"m"};
copyright(\%commands) if $commands->{"copyright"}; copyright(\%commands) if $commands->{"copyright"};
changelog(\%commands) if $commands->{"changelog"}; changelog(\%commands) if $commands->{"changelog"};
print "$argument\n"; print "$argument\n";
@ -278,12 +315,18 @@ sub c_indexer {
elsif (which_character(\%commands)) { elsif (which_character(\%commands)) {
my %store_commands = %commands; my %store_commands = %commands;
$argument = $_; $argument = $_;
if ($commands->{"scripts"} || $commands->{"preinst"} || if (
$commands->{"postinst"} || $commands->{"prerm"} || $commands->{"scripts"} ||
$commands->{"postrm" || $commands->{"config"} || $commands->{"templates"}}) { $commands->{"preinst"} ||
$commands->{"postinst"} ||
$commands->{"prerm"} ||
$commands->{"postrm"} ||
$commands->{"config"} ||
$commands->{"templates"}) {
scripts(\%commands); scripts(\%commands);
} }
menu(\%commands) if $commands->{"menu"} || $commands->{"m"}; menu(\%commands) if $commands->{"menu"} ||
$commands->{"m"};
copyright(\%commands) if $commands->{"copyright"}; copyright(\%commands) if $commands->{"copyright"};
changelog(\%commands) if $commands->{"changelog"}; changelog(\%commands) if $commands->{"changelog"};
if (the_character(\%commands) ne "ok") { if (the_character(\%commands) ne "ok") {
@ -299,12 +342,18 @@ sub c_indexer {
# no Ts. # no Ts.
else { else {
if ($commands->{"scripts"} || $commands->{"preinst"} || if (
$commands->{"postinst"} || $commands->{"prerm"} || $commands->{"scripts"} ||
$commands->{"postrm"} || $commands->{"config"} || $commands->{"templates"} ) { $commands->{"preinst"} ||
$commands->{"postinst"} ||
$commands->{"prerm"} ||
$commands->{"postrm"} ||
$commands->{"config"} ||
$commands->{"templates"} ) {
scripts(\%commands); scripts(\%commands);
} }
menu(\%commands) if $commands->{"menu"} || $commands->{"m"}; menu(\%commands) if $commands->{"menu"} ||
$commands->{"m"};
copyright(\%commands) if $commands->{"copyright"}; copyright(\%commands) if $commands->{"copyright"};
changelog(\%commands) if $commands->{"changelog"}; changelog(\%commands) if $commands->{"changelog"};
singular(\%commands); singular(\%commands);
@ -396,6 +445,8 @@ sub indexer {
# -t BUT NOT -C,-D,-L # # -t BUT NOT -C,-D,-L #
####################### #######################
elsif (!$commands->{"c"} && (!$commands->{"d"} || !$commands->{"l"})) { elsif (!$commands->{"c"} && (!$commands->{"d"} || !$commands->{"l"})) {
if ($commands->{"T"}) { if ($commands->{"T"}) {
T_indexer(\@alot,\%commands); T_indexer(\@alot,\%commands);
} }
@ -422,7 +473,6 @@ sub indexer {
($commands->{"c"} && ($commands->{"c"} &&
($commands->{"d"} || ($commands->{"d"} ||
$commands->{"l"}))) { $commands->{"l"}))) {
c_indexer(\@alot,\%commands); c_indexer(\@alot,\%commands);
} # end elsif } # end elsif

Loading…
Cancel
Save