From a845140044510ef3fdc179b333301218d3faefe5 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Fri, 18 Jan 2002 20:22:20 +0000 Subject: - write the 'common' part of the 'explanations' stuff, with nice help from Pixel for the tough Perl part - move 'use standalone' up in all standalone apps, to comply to 'explanations' --- perl-install/standalone/XFdrake | 3 ++- perl-install/standalone/adduserdrake | 3 ++- perl-install/standalone/diskdrake | 4 +++- perl-install/standalone/drakautoinst | 9 ++++++++- perl-install/standalone/drakbackup | 4 +++- perl-install/standalone/drakboot | 2 +- perl-install/standalone/drakfont | 4 +++- perl-install/standalone/drakproxy | 9 ++++++++- perl-install/standalone/draksec | 3 ++- perl-install/standalone/drakxconf | 2 +- perl-install/standalone/drakxservices | 3 ++- perl-install/standalone/keyboarddrake | 2 +- perl-install/standalone/livedrake | 3 ++- perl-install/standalone/localedrake | 2 ++ perl-install/standalone/logdrake | 10 +++++++++- perl-install/standalone/mousedrake | 3 ++- perl-install/standalone/net_monitor | 4 +++- perl-install/standalone/printerdrake | 3 ++- perl-install/standalone/tinyfirewall | 4 +++- 19 files changed, 59 insertions(+), 18 deletions(-) (limited to 'perl-install/standalone') diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 891722d50..66b8746ea 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -19,8 +19,9 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use interactive; -use standalone; use modules; use Xconfigurator; use Xconfig; diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake index d2893c850..c176f5936 100755 --- a/perl-install/standalone/adduserdrake +++ b/perl-install/standalone/adduserdrake @@ -2,9 +2,10 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use common; use interactive; -use standalone; use any; local $_ = join '', @ARGV; diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index be570dadb..d428e6955 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -23,9 +23,11 @@ use lib qw(/usr/lib/libDrakX); + +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use common; use diskdrake_interactive; -use standalone; use interactive; use detect_devices; use fsedit; diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index 1dc3fc2a3..04ff72cbc 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -15,9 +15,10 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use common; use interactive; -use standalone; use devices; use detect_devices; use steps; @@ -359,6 +360,12 @@ sub control_buttons { #------------------------------------------------- #- $Log$ +#- Revision 1.16 2002/01/18 20:22:20 gc +#- - write the 'common' part of the 'explanations' stuff, +#- with nice help from Pixel for the tough Perl part +#- - move 'use standalone' up in all standalone apps, +#- to comply to 'explanations' +#- #- Revision 1.15 2002/01/08 10:21:15 fpons #- removed stupid invocation of _("$_"), is it correct code to change it to $_ only ? #- diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup index dbdfdee24..80bf7f8d6 100755 --- a/perl-install/standalone/drakbackup +++ b/perl-install/standalone/drakbackup @@ -112,8 +112,10 @@ use Gtk; use lib qw(/usr/lib/libDrakX ); + +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use interactive; -use standalone; use my_gtk qw(:helpers :wrappers); use common; use strict; diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 8a17b4813..dd0eb6403 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -2,10 +2,10 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' use common; use interactive; -use standalone; use any; use bootloader; use detect_devices; diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 462d01fb2..ea04c6e96 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -81,8 +81,10 @@ use Gtk; use lib qw(/usr/lib/libDrakX ); + +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use interactive; -use standalone; use my_gtk qw(:helpers :wrappers); use common; use strict; diff --git a/perl-install/standalone/drakproxy b/perl-install/standalone/drakproxy index acfc159ba..ec6d5cbfc 100755 --- a/perl-install/standalone/drakproxy +++ b/perl-install/standalone/drakproxy @@ -15,8 +15,9 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use interactive; -use standalone; use proxy; use my_gtk qw(:helpers :wrappers); @@ -67,6 +68,12 @@ Gtk->exit(0); #------------------------------------------------- #- $Log$ +#- Revision 1.9 2002/01/18 20:22:20 gc +#- - write the 'common' part of the 'explanations' stuff, +#- with nice help from Pixel for the tough Perl part +#- - move 'use standalone' up in all standalone apps, +#- to comply to 'explanations' +#- #- Revision 1.8 2001/10/30 20:11:31 damien #- corrected ref($in) =~ /gtk/ #- diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index cf536104c..aef9cd80d 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -2,9 +2,10 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use common; use interactive; -use standalone; use mouse; use c; diff --git a/perl-install/standalone/drakxconf b/perl-install/standalone/drakxconf index 51530940d..a8d3158eb 100755 --- a/perl-install/standalone/drakxconf +++ b/perl-install/standalone/drakxconf @@ -2,9 +2,9 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' use interactive; -use standalone; use keyboard; use Xconfigurator_consts; use common; diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices index 21e7baade..f5249475b 100755 --- a/perl-install/standalone/drakxservices +++ b/perl-install/standalone/drakxservices @@ -2,9 +2,10 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use common; use interactive; -use standalone; use services; use log; diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake index a6c415c7e..0ac98cb49 100755 --- a/perl-install/standalone/keyboarddrake +++ b/perl-install/standalone/keyboarddrake @@ -2,10 +2,10 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' use interactive; use keyboard; -use standalone; use Xconfigurator_consts; use common; use c; diff --git a/perl-install/standalone/livedrake b/perl-install/standalone/livedrake index bb689996f..9c2af4c03 100755 --- a/perl-install/standalone/livedrake +++ b/perl-install/standalone/livedrake @@ -2,9 +2,10 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use common; use interactive; -use standalone; use run_program; use c; diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake index cc9b68260..cc43ee653 100644 --- a/perl-install/standalone/localedrake +++ b/perl-install/standalone/localedrake @@ -2,6 +2,8 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use interactive; use lang; use any; diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 72bedfc45..8fbc4ca2a 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -23,8 +23,10 @@ use POSIX; use Gtk; use lib qw(/usr/lib/libDrakX); + +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use interactive; -use standalone; use any; use Config; use my_gtk qw(:helpers :wrappers); @@ -409,6 +411,12 @@ sub destroy_window { # log # $Log$ +# Revision 1.3 2002/01/18 20:22:20 gc +# - write the 'common' part of the 'explanations' stuff, +# with nice help from Pixel for the tough Perl part +# - move 'use standalone' up in all standalone apps, +# to comply to 'explanations' +# # Revision 1.2 2001/12/18 17:31:48 yduret # fix console mode : exit now # diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index f3609b936..64501a531 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -2,9 +2,10 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use common; use interactive; -use standalone; use modules; use detect_devices; use Xconfig; diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor index 70504ed6e..2bd2120ca 100755 --- a/perl-install/standalone/net_monitor +++ b/perl-install/standalone/net_monitor @@ -20,8 +20,10 @@ use Gtk; use lib qw(/usr/lib/libDrakX); + +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use interactive; -use standalone; use my_gtk qw(:helpers :wrappers); #-use Data::Dumper; use common; diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake index 0a339adf6..87d44e252 100755 --- a/perl-install/standalone/printerdrake +++ b/perl-install/standalone/printerdrake @@ -20,8 +20,9 @@ use lib qw(/usr/lib/libDrakX); +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use interactive; -use standalone; use printerdrake; use printer; use c; diff --git a/perl-install/standalone/tinyfirewall b/perl-install/standalone/tinyfirewall index df01e76e9..3f91a0027 100755 --- a/perl-install/standalone/tinyfirewall +++ b/perl-install/standalone/tinyfirewall @@ -19,8 +19,10 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. use lib qw(/usr/lib/libDrakX); + +use standalone; #- warning, standalone must be loaded very first, for 'explanations' + use interactive; -use standalone; use tinyfirewall; $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/; -- cgit v1.2.1