diff options
Diffstat (limited to 'perl-install/standalone/drakhelp')
| -rwxr-xr-x | perl-install/standalone/drakhelp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp index 8117d5b7b..c2b46979a 100755 --- a/perl-install/standalone/drakhelp +++ b/perl-install/standalone/drakhelp @@ -9,35 +9,36 @@ use standalone; #- warning, standalone must be loaded very first, for 'expla use interactive; use common; use any; -use ctxhelp; +eval { require ctxhelp }; use log; sub usage() { print STDERR N(" drakhelp 0.1 Copyright (C) %s Mandriva. +Copyright (C) %s Mageia. This is free software and may be redistributed under the terms of the GNU GPL. Usage: -", '2003-2008') . N(" --help - display this help +", '2003-2008', '2011') . N(" --help - display this help ") . N(" --id <id_label> - load the html help page which refers to id_label ") . N(" --doc <link> - link to another web page ( for WM welcome frontend) "); exit(0); } my ($opt, $idlabel) = @ARGV; -@ARGV == 2 && ($opt eq '--id' || $opt eq '--doc' || $opt eq '--help') or usage(); +@ARGV == 2 && member($opt, qw(--id --doc --help)) or usage(); -my ($instpath, $ancpath, $package) = ctxhelp::path2help($opt, $idlabel); +my ($instpath, $ancpath, $package) = eval { ctxhelp::path2help($opt, $idlabel) }; if (! -e $instpath) { system('/usr/sbin/drakhelp_inst', $package); } if (! -e $instpath) { #- trying again, asking for the english entry - ($instpath, $ancpath, my $package2) = ctxhelp::path2help($opt, $idlabel, 'en'); + ($instpath, $ancpath, my $package2) = eval { ctxhelp::path2help($opt, $idlabel, 'en') }; if (! -e $instpath && $package ne $package2) { system("/usr/sbin/drakhelp_inst $package2"); } @@ -47,7 +48,7 @@ if (-f $instpath) { local $ENV{HOME} = '/root' if !$<; run_program::raw({ detach => 1 }, 'display_help', "file://$ancpath"); } else { - $ugtk2::wm_icon = "help"; + $ugtk3::wm_icon = "help"; my $in = interactive->vnew; - $in->ask_warn(N("Mandriva Linux Help Center"), N("No Help entry for %s\n", $idlabel)); + $in->ask_warn(N("%s Help Center", N("Mageia")), N("No Help entry for %s\n", $idlabel)); } |