From 4517ae583412a97b5f6d48cf7f53e462949acb0e Mon Sep 17 00:00:00 2001 From: Daouda Lo Date: Tue, 19 Oct 2004 07:26:56 +0000 Subject: - don't hardcore distroname - don't trigger help system when mandrake-doc-common is not installed - don't trigger bug report in oem mode --- perl-install/standalone/printerdrake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'perl-install') 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, '' ], [ N("/_Help"), undef, undef, undef, '' ], - [ N("/_Help") . N("/_Help"), undef, sub { HelpSystem() }, undef, '', 'gtk-help' ], - [ N("/_Help") . N("/_Report Bug"), undef, sub { system("$ENV{BROWSER} https://qa.$domainname &") }, undef, '', 'gtk-stop' ], + if_(-x "/usr/sbin/drakhelp_inst", + [ N("/_Help") . N("/_Help"), undef, sub { HelpSystem() }, undef, '', 'gtk-help' ], + ), + if_(!-e "/etc/sysconfig/oem", + [ N("/_Help") . N("/_Report Bug"), undef, sub { system("$ENV{BROWSER} https://qa.$domainname &") }, undef, '', 'gtk-stop' ], + ), [ N("/_Help") . N("/_About..."), undef, \&About, undef, '', 'gtk-preferences' ] ) ); -- cgit v1.2.1