summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-08 12:04:05 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-08 12:04:05 +0000
commit92ca8cecc90b06288a767d40573e24b791935d75 (patch)
tree720635f3f8f10c488c01b7185453dfda5ead08ec
parent34b54ae4468e77bc6ffe5fa8360b398080f7a074 (diff)
downloadcontrol-center-92ca8cecc90b06288a767d40573e24b791935d75.tar
control-center-92ca8cecc90b06288a767d40573e24b791935d75.tar.gz
control-center-92ca8cecc90b06288a767d40573e24b791935d75.tar.bz2
control-center-92ca8cecc90b06288a767d40573e24b791935d75.tar.xz
control-center-92ca8cecc90b06288a767d40573e24b791935d75.zip
simplify
-rwxr-xr-xcontrol-center15
1 files changed, 6 insertions, 9 deletions
diff --git a/control-center b/control-center
index 0f0d78d5..6c91d78b 100755
--- a/control-center
+++ b/control-center
@@ -1222,17 +1222,14 @@ my $align2 = lang::text_direction_rtl() ? "right" : "left";
foreach (@tree) {
my ($text, $icon, $subtree) = @$_;
- my @subtree;
- foreach my $stuff (@$subtree) {
+ my @subtree = grep {
+ my $stuff = $_;
my $exec = first(split /\s+/, $programs{$stuff}{binary});
- next if $programs{$stuff}{hidden};
+ my $is_present = -x $exec;
# do not complain about missing entries in move:
- if (-x $exec) {
- push @subtree, $stuff;
- } elsif (-e $exec) {
- warn qq("$exec" is not executable [$stuff]) if $mdk_rel !~ /Move/;
- }
- }
+ warn qq("$exec" is not executable [$stuff]) if $mdk_rel !~ /Move/ && !$is_present;
+ !$programs{$stuff}{hidden} && $is_present;
+ } @$subtree;
# Skip empty classes:
next if !@subtree;