From 4dd035489e3ea4e336d70d5c10fec628828cd5b0 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 29 Oct 2009 18:56:35 +0000 Subject: (real_bin_path) factorize --- control-center | 9 +++++++-- 1 file 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; -- cgit v1.2.1