diff options
| author | Daouda Lo <daouda@mandriva.com> | 2004-10-21 10:36:38 +0000 |
|---|---|---|
| committer | Daouda Lo <daouda@mandriva.com> | 2004-10-21 10:36:38 +0000 |
| commit | 34e2d4e82d1900c508b0ef0bdadb2767a4854e34 (patch) | |
| tree | 09cf9e551a8ca52dd86383ff4028de9e2400e6f9 | |
| parent | 805effe05bbbffdcd5590cc28f1eba565ba1fc8e (diff) | |
| download | drakx-34e2d4e82d1900c508b0ef0bdadb2767a4854e34.tar drakx-34e2d4e82d1900c508b0ef0bdadb2767a4854e34.tar.gz drakx-34e2d4e82d1900c508b0ef0bdadb2767a4854e34.tar.bz2 drakx-34e2d4e82d1900c508b0ef0bdadb2767a4854e34.tar.xz drakx-34e2d4e82d1900c508b0ef0bdadb2767a4854e34.zip | |
- backport patches to MDK-10-update branch for oem
| -rwxr-xr-x | perl-install/standalone/harddrake2 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 9afdcf78a..be8b2bbd2 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -78,6 +78,8 @@ my $conffile = "/etc/sysconfig/harddrake2/ui.conf"; my ($current_device, $current_configurator); +my %sysh = distrib(); +my $distro_name = $sysh{system}; #-PO Translators, please keep all "/" charaters !!! my %menus = ( @@ -103,7 +105,9 @@ my @menu_items = [ join('', @{$menu_options{JAZZ_DETECTION}}), undef, sub { $options{JAZZ_DETECTION} = $check_boxes{JAZZ_DETECTION}->get_active }, undef, '<CheckItem>' ], [ $menus{help}, undef, undef, undef, '<Branch>' ], - [ $menus{help}.N("/_Help"), undef, sub { unless (fork()) { exec("drakhelp --id harddrake") } }, undef, '<Item>' ], + if_(-x "/usr/sbin/drakhelp_inst", + [ $menus{help}.N("/_Help"), undef, sub { unless (fork()) { exec("drakhelp --id harddrake") } }, undef, '<Item>' ], + ), [ $menus{help}.N("/_Fields description"), undef, sub { if ($current_device) { create_dialog(N("Harddrake help"), @@ -117,12 +121,14 @@ my @menu_items = }, undef, '<Item>' ], - [ $menus{help}.N("/_Report Bug"), undef, sub { unless (fork()) { exec("drakbug --report harddrake2 &") } }, undef, '<Item>' ], + if_(!-e "/etc/sysconfig/oem", + [ $menus{help}.N("/_Report Bug"), undef, sub { unless (fork()) { exec("drakbug --report harddrake2 &") } }, undef, '<Item>' ], + ), [ $menus{help}.N("/_About..."), undef, sub { create_dialog(N("About Harddrake"), #-PO Do not alter the <span ..> and </span> tags - N("This is HardDrake, a Mandrake hardware configuration tool.\n<span foreground=\"royalblue3\">Version:</span> %s -<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud <tvignaud\@mandrakesoft.com>\n\n", $harddrake::data::version) . "\n" . + N("This is HardDrake, a %s hardware configuration tool.\n<span foreground=\"royalblue3\">Version:</span> %s +<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud <tvignaud\@mandrakesoft.com>\n\n", $distro_name, $harddrake::data::version) . "\n" . formatAlaTeX($::license), { use_markup => 1, if_(!$::isEmbedded, transient => $w->{window}) }); }, undef, '<Item>' ] |