13 files changed, 13 insertions, 130 deletions
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index 2eebdc7e4..4a52cefc0 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -22,16 +22,7 @@ use standalone;     #- warning, standalone must be loaded very first, for 'expla
 use strict;
 
 use interactive;
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:helpers :wrappers :create));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:helpers :wrappers :create);
 use common;
 use run_program;
 use bootloader;
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index a0ac09265..7cce5ec9e 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -23,16 +23,7 @@ use lib qw(/usr/lib/libDrakX);
 
 use standalone;
 use common;
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:all));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:all);
 use Config;
 
 my $bugzilla_url = "http://drakbug.mandrakesoft.com";
diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock
index 2012cf6ad..a1dd5b5f5 100755
--- a/perl-install/standalone/drakclock
+++ b/perl-install/standalone/drakclock
@@ -6,16 +6,7 @@ use POSIX;
 use common;
 # i18n : IMPORTANT to get correct namespace (drakconf instead of libDrakX)
 BEGIN { unshift @::textdomains, 'drakconf' }
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:all));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:all);
 use interactive;
 use standalone;
 use timezone;
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index 5bae9148d..b0962181d 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -29,16 +29,7 @@ use lib qw(/usr/lib/libDrakX);
 
 use standalone; #- warning, standalone must be loaded very first, for 'explanations'
 use common;
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:create :dialogs :helpers :wrappers));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:create :dialogs :helpers :wrappers);
 use detect_devices;
 
 require_root_capability();
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index a35378eef..3b232919b 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -86,16 +86,7 @@ use lib qw(/usr/lib/libDrakX);
 
 use standalone;    #- warning, standalone must be loaded very first, for 'explanations'
 
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:create :dialogs :helpers :wrappers));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:create :dialogs :helpers :wrappers);
 use common;
 
 require_root_capability();
diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm
index 7b7e56cc2..234228edb 100755
--- a/perl-install/standalone/drakperm
+++ b/perl-install/standalone/drakperm
@@ -6,16 +6,7 @@ use lib qw(/usr/lib/libDrakX);
 use standalone;
 
 use common;
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:helpers :wrappers :create));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:helpers :wrappers :create);
 
 require_root_capability();
 local $_ = join '', @ARGV;
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 9e8e3129a..04e9dd0b4 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -24,16 +24,7 @@ use lib qw(/usr/lib/libDrakX);
 use common;
 use standalone;
 use vars qw($MODE %options);
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:helpers :wrappers :ask :create));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:helpers :wrappers :ask :create);
 use run_program;
 use security::level;
 use security::msec;
diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash
index 8dc252b5f..527631bd6 100755
--- a/perl-install/standalone/draksplash
+++ b/perl-install/standalone/draksplash
@@ -4,16 +4,7 @@ use strict;
 use lib qw(/usr/lib/libDrakX);
 use standalone;
 use common;
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:helpers :wrappers :create));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:helpers :wrappers :create);
 use interactive;
 
 #- convenience variables for true and false
diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups
index 7bfb70642..9f55af292 100755
--- a/perl-install/standalone/drakups
+++ b/perl-install/standalone/drakups
@@ -6,16 +6,7 @@ use standalone;
 use common;
 use mouse;
 use detect_devices;
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:create :dialogs :helpers :wrappers));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:create :dialogs :helpers :wrappers);
 use interactive;
 use Libconf qw(:functions);
 use Libconf::Glueconf::NUT::Ups_conf;
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 74e98b563..d6822b1cd 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -6,16 +6,7 @@ use lib qw(/usr/lib/libDrakX);
 use standalone;
 use common;
 
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:create :helpers :wrappers));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:create :helpers :wrappers);
 use interactive;
 use harddrake::data;  #- needs to stay after use-ugtk2 as long as this module defines globals containing some N()
 use POSIX qw(:sys_wait_h);
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 541d97a58..edc84a591 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -26,16 +26,7 @@ use lib qw(/usr/lib/libDrakX);
 use standalone;     #- warning, standalone must be loaded very first, for 'explanations'
 use common;
 use interactive;
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:create :dialogs :helpers :wrappers));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:create :dialogs :helpers :wrappers);
 use vars qw(*F);
 
 my $in = 'interactive'->vnew('su');
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index 6099976a3..c31d1006a 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -27,16 +27,7 @@ use standalone;     #- warning, standalone must be loaded very first, for 'expla
 
 use c;
 use interactive;
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:create :helpers :wrappers));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:create :helpers :wrappers);
 use common;
 use network::netconnect;
 use network::tools;
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 889696b09..00ebf6288 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -26,16 +26,7 @@ use standalone;
 use common;
 use any;
 
-BEGIN {
-    eval {
-	require ugtk2;
-	ugtk2->import(qw(:all));
-    };
-    if ($@) {
-	print "This program cannot be run in console mode.\n";
-	c::_exit(0);  #- skip ugtk2::END
-    }
-}
+use ugtk2 qw(:all);
 use interactive;
 use POSIX qw(mktime ceil);
 use printer::printerdrake;