1 files changed, 12 insertions, 41 deletions

diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 994ff7edc..806ebf7cd 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -1,14 +1,16 @@
-package standalone; # $Id$
+package standalone;
 
 use c;
 use strict;
+use subs qw(exit);
 use common qw(N N_ if_ backtrace);
 use Config;
+use drakbug;
 
 BEGIN { unshift @::textdomains, 'libDrakX-standalone' }
 
-#- for sanity (if a use standalone is made during install, MANY problems will happen)
 require 'log.pm'; #- "require log" causes some pb, perl thinking that "log" is the log() function
+#- for sanity (if a use standalone is made during install, MANY problems will happen)
 if ($::isInstall) {
     log::l('ERROR: use standalone made during install :-(');
     log::l('backtrace: ' . backtrace());
@@ -53,17 +55,16 @@ Backup and Restore application
 --version             : show version number.
 "),
 
-           'drakboot' => N_("[--boot] [--splash]
+           'drakboot' => N_("[--boot]
 OPTIONS:
   --boot            - enable to configure boot loader
-  --splash          - enable to configure boot theme
 default mode: offer to configure autologin feature"),
            'drakbug' => N_("[OPTIONS] [PROGRAM_NAME]
 
 OPTIONS:
   --help            - print this help message.
-  --report          - program should be one of Mandriva Linux tools
-  --incident        - program should be one of Mandriva Linux tools"),
+  --report          - program should be one of %s tools
+  --incident        - program should be one of %s tools"),
            'drakconnect' => N_("[--add]
   --add             - \"add a network interface\" wizard
   --del             - \"delete a network interface\" wizard
@@ -86,7 +87,7 @@ OPTIONS:
            'draksec' => "[--debug]
 --debug: print debugging information",
            'drakTermServ' => N_("[OPTIONS]...
-Mandriva Linux Terminal Server Configurator
+%s Terminal Server Configurator
 --enable         : enable MTS
 --disable        : disable MTS
 --start          : start MTS
@@ -110,7 +111,7 @@ Network & Internet connection and monitoring application
 --quiet : do not be interactive. To be used with (dis)connect."),
 	      'printerdrake' => " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]",
 	      'rpmdrake' => N_("[OPTION]...
-  --no-confirmation      do not ask first confirmation question in Mandriva Update mode
+  --no-confirmation      do not ask first confirmation question in %s Update mode
   --no-verify-rpm        do not verify packages signatures
   --changelog-first      display changelog before filelist in the description window
   --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"),
@@ -120,7 +121,7 @@ Network & Internet connection and monitoring application
        XFdrake resolution"),
 	      );
 
-$usages{$_} = $usages{rpmdrake} foreach qw(rpmdrake-remove MandrivaUpdate);
+$usages{$_} = $usages{rpmdrake} foreach qw(rpmdrake-remove MageiaUpdate);
 $usages{Xdrakres} = $usages{XFdrake};
 
 
@@ -135,13 +136,14 @@ sub __exit {
 }
 
 
-sub real_version {
+sub real_version() {
     return "VER"; # version automatically set from Makefile
 }
 
 sub version() {
     print 'Drakxtools version ' . real_version() . '
 Copyright (C) 1999-2008 Mandriva by <install@mandriva.com>
+Copyright (C) 2010-2014 Mageia
 ',  $::license, "\n";
 }
 
@@ -189,37 +191,6 @@ our @common_functs = qw(renamef linkf symlinkf output substInFile mkdir_p rm_rf
 our @builtin_functs = qw(chmod chown __exit exit unlink link symlink rename system);
 our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree any bootloader bootlook c commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modules::parameters modules mouse my_gtk network network::adsl network::ethernet network::connection network::isdn_consts network::isdn network::modem network::netconnect network::network fs::remote::nfs fs::remote::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall);
 
-sub bug_handler {
-    my ($error, $is_signal) = @_;
-
-    # exceptions in eval are OK:
-    return if $error && $^S ne '0' && !$is_signal;
-
-    # exceptions with "\n" are normal ways to quit:
-    if (!$is_signal && $error eq MDK::Common::String::formatError($error)) {
-        warn $error;
-        exit(255);
-    }
-
-    # we want the full backtrace:
-    $error .= "\n" if $is_signal;
-    $error .= common::backtrace() if $error;
-
-    my $progname = $0;
-
-    # do not loop if drakbug crashes and do not complain about wizcancel:
-    if ($progname =~ /drakbug/ || $error =~ /wizcancel/ || !-x '/usr/bin/drakbug') {
-    	warn $error;
-    	exit(1);
-    }
-    $progname =~ s|.*/||;
-    system('drakbug',  if_($error, '--error', $error), '--incident', $progname);
-    c::_exit(1);
-}
-
-$SIG{SEGV} = sub { bug_handler(@_, 1) };
-$SIG{__DIE__} = \&bug_handler;
-
 sub import() {
     ($standalone_name = $0) =~ s|.*/||;
     c::openlog($standalone_name . "[$$]");