diff options
| author | Daouda Lo <daouda@mandriva.com> | 2004-10-19 07:26:56 +0000 |
|---|---|---|
| committer | Daouda Lo <daouda@mandriva.com> | 2004-10-19 07:26:56 +0000 |
| commit | 4517ae583412a97b5f6d48cf7f53e462949acb0e (patch) | |
| tree | 67f0af88dae0d1ca83050ef6f2c8ec7b9214c793 /perl-install | |
| parent | b3d398736a23f88a4b7405308ffcfadad3644d5c (diff) | |
| download | drakx-4517ae583412a97b5f6d48cf7f53e462949acb0e.tar drakx-4517ae583412a97b5f6d48cf7f53e462949acb0e.tar.gz drakx-4517ae583412a97b5f6d48cf7f53e462949acb0e.tar.bz2 drakx-4517ae583412a97b5f6d48cf7f53e462949acb0e.tar.xz drakx-4517ae583412a97b5f6d48cf7f53e462949acb0e.zip | |
- don't hardcore distroname
- don't trigger help system when mandrake-doc-common is not installed
- don't trigger bug report in oem mode
Diffstat (limited to 'perl-install')
| -rwxr-xr-x | perl-install/standalone/printerdrake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake index 013905069..3499b90f3 100755 --- a/perl-install/standalone/printerdrake +++ b/perl-install/standalone/printerdrake @@ -37,7 +37,9 @@ use Gtk2::Gdk::Keysyms; use modules; use c; -my $distroname = "Mandrakelinux"; +my %sysh = distrib(); +my $distroname = $sysh{system}; + my $domainname = "mandrakesoft.com"; my $pixdir = '/usr/share/libDrakX/pixmaps/'; @@ -175,8 +177,12 @@ my ($menu, $factory) = create_factory_menu($::isEmbedded ? $::Plug : $us->{wnd}{ (); }, undef, '<CheckItem>' ], [ N("/_Help"), undef, undef, undef, '<Branch>' ], - [ N("/_Help") . N("/_Help"), undef, sub { HelpSystem() }, undef, '<StockItem>', 'gtk-help' ], - [ N("/_Help") . N("/_Report Bug"), undef, sub { system("$ENV{BROWSER} https://qa.$domainname &") }, undef, '<StockItem>', 'gtk-stop' ], + if_(-x "/usr/sbin/drakhelp_inst", + [ N("/_Help") . N("/_Help"), undef, sub { HelpSystem() }, undef, '<StockItem>', 'gtk-help' ], + ), + if_(!-e "/etc/sysconfig/oem", + [ N("/_Help") . N("/_Report Bug"), undef, sub { system("$ENV{BROWSER} https://qa.$domainname &") }, undef, '<StockItem>', 'gtk-stop' ], + ), [ N("/_Help") . N("/_About..."), undef, \&About, undef, '<StockItem>', 'gtk-preferences' ] ) ); |