summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-10-29 18:56:35 +0000
committerThierry Vignaud <tv@mandriva.org>2009-10-29 18:56:35 +0000
commit4dd035489e3ea4e336d70d5c10fec628828cd5b0 (patch)
tree905e1aae4350ba42eb5ea6e027a8b89d16a38fe2
parent6eba59f949f85aa4c4c1e9cf8e91648d1cd8fc9c (diff)
downloadcontrol-center-4dd035489e3ea4e336d70d5c10fec628828cd5b0.tar
control-center-4dd035489e3ea4e336d70d5c10fec628828cd5b0.tar.gz
control-center-4dd035489e3ea4e336d70d5c10fec628828cd5b0.tar.bz2
control-center-4dd035489e3ea4e336d70d5c10fec628828cd5b0.tar.xz
control-center-4dd035489e3ea4e336d70d5c10fec628828cd5b0.zip
(real_bin_path) factorize
-rwxr-xr-xcontrol-center9
1 files changed, 7 insertions, 2 deletions
diff --git a/control-center b/control-center
index 5fb2e56d..2d1af4d2 100755
--- a/control-center
+++ b/control-center
@@ -806,7 +806,7 @@ sub clean_list {
my ($subtree) = @_;
grep {
my $stuff = $_;
- my $exec = first(split /\s+/, $programs{$stuff}{binary});
+ my $exec = real_bin_path($programs{$stuff}{binary});
my $is_present = -x $exec;
if (!$is_present && $programs{$stuff}{packages2install}) {
$is_present = 1;
@@ -1208,13 +1208,18 @@ sub fork_ {
}
}
+sub real_bin_path {
+ my ($prog) = @_;
+ first(split /\s+/, $prog);
+}
+
sub run_tool {
my ($label, $box, $icon, $text, $tool) = @_;
my ($exec, $gtkplug) = @$tool{qw(binary embedded)};
$application_driven_menu = $tool->{application_driven_menu};
return if $tool_pids{$label};
my $will_run_gurpmi;
- if (! -x first(split /\s+/, $exec)) {
+ if (! -x real_bin_path($exec)) {
if ($tool->{packages2install}) {
# gurpmi doesn't support being embedded yet:
$gtkplug = -1;