diff options
Diffstat (limited to 'control-center')
-rwxr-xr-x | control-center | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/control-center b/control-center index 834ea297..5fc7333a 100755 --- a/control-center +++ b/control-center @@ -133,7 +133,7 @@ sub wizard_format { my ($id, $wizard, $icon, $description, $long_description, $file) = @$_; $programs{$id} = { - binary => "$sbindir/drakwizard $wizard", + binary => "drakwizard $wizard", embedded => 1, description => $description, long_description => $long_description, @@ -292,7 +292,7 @@ my @tree = ( my ($id, $icon, $op, $description, $long_description) = @$_; $programs{$id} = { - binary => "$bindir/mdkwebadmin.pl $op", + binary => "mdkwebadmin.pl $op", embedded => -1, # too big description => $description, long_description => $long_description, @@ -347,7 +347,7 @@ my @tree = ( list => [ "Printer", "Scanner", - if_(-x "$bindir/drakfax", "Fax"), + if_(-x real_bin_path("drakfax"), "Fax"), ] }, { @@ -368,7 +368,7 @@ my @tree = ( list => [ "Network Center", "Add Connection", - if_(!-x "$sbindir/draknetcenter", + if_(!-x real_bin_path("draknetcenter"), "Configure Internet", "Manage Connection", "Monitor Connection", @@ -421,7 +421,7 @@ my @tree = ( if_($ENV{LANGUAGE} !~ /^zh/, "Console"), "Users", "Migration", - if_(-x "$xbindir/drakcronat", "Programs scheduling"), + if_(-x real_bin_path("drakcronat"), "Programs scheduling"), "Backups", 'Snapshots', "Virtualization", @@ -472,7 +472,7 @@ my @tree = ( my $full_name = $text . ($::i ? $::i + 1 : ''); $programs{$full_name} = { - binary => "$sbindir/diskdrake --removable=$_->{device}", + binary => "diskdrake --removable=$_->{device}", embedded => 1, description => $text, long_description => sprintf(translate($long_text), $_->{info}), @@ -564,7 +564,7 @@ if (scalar glob_("$more_wizard_dir/*.conf")) { next unless -f $file; my %tmp = getVarsFromSh($file); $programs{$tmp{NAME}} = { - binary => "$sbindir/drakwizard " . lc($file), + binary => "drakwizard " . lc($file), embedded => 1, description => $tmp{DESCRIPTION}, icon => $tmp{ICON} || 'wizard-mdk', @@ -1210,7 +1210,10 @@ sub fork_ { sub real_bin_path { my ($prog) = @_; - first(split /\s+/, $prog); + $prog = first(split /\s+/, $prog); + return $prog if $prog =~ /\//; + return "/usr/bin/$prog" if -x "/usr/bin/$prog"; + return "/usr/sbin/$prog"; } sub run_tool { @@ -1223,7 +1226,7 @@ sub run_tool { if ($tool->{packages2install}) { # gurpmi doesn't support being embedded yet: $gtkplug = -1; - $exec = join(' ', "$bindir/gurpmi", split(/\s/, $tool->{packages2install})); + $exec = join(' ', "/usr/bin/gurpmi", split(/\s/, $tool->{packages2install})); $will_run_gurpmi = 1; } else { splash_warning(N("cannot fork and exec \"%s\" since it is not executable", $exec)); |