From 79d226c48d6de4f26c604ddbd0ce769a58d548c6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 31 Jul 2002 23:10:55 +0000
Subject: Handle parsing --embedded command line in standalone.pm => allows to
 remove the somewhat mythical      $::isEmbedded = ($::XID, $::CCPID) =
 "@ARGV" =~ /--embedded (\w+) (\w+)/

---
 perl-install/standalone.pm            | 8 +++++++-
 perl-install/standalone/XFdrake       | 2 --
 perl-install/standalone/diskdrake     | 5 +----
 perl-install/standalone/drakTermServ  | 1 -
 perl-install/standalone/drakautoinst  | 7 +++++--
 perl-install/standalone/drakbackup    | 1 -
 perl-install/standalone/drakboot      | 1 -
 perl-install/standalone/drakconnect   | 1 -
 perl-install/standalone/drakfloppy    | 1 -
 perl-install/standalone/drakfont      | 1 -
 perl-install/standalone/drakgw        | 7 +++++--
 perl-install/standalone/drakproxy     | 1 -
 perl-install/standalone/draksec       | 1 -
 perl-install/standalone/drakxservices | 2 --
 perl-install/standalone/drakxtv       | 2 +-
 perl-install/standalone/keyboarddrake | 1 -
 perl-install/standalone/logdrake      | 6 +++++-
 perl-install/standalone/mousedrake    | 1 -
 perl-install/standalone/net_monitor   | 1 -
 perl-install/standalone/printerdrake  | 1 -
 perl-install/standalone/scannerdrake  | 6 +++++-
 perl-install/standalone/tinyfirewall  | 1 -
 22 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index e001f6d2c..7e5948f22 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -9,7 +9,13 @@ $ENV{SHARE_PATH} ||= "/usr/share";
 c::setlocale();
 c::bindtextdomain('libDrakX', "/usr/share/locale");
 
-
+my $i;
+foreach (@ARGV) {
+    $i++;
+    $_ eq '--embedded' or next;
+    (undef, $::XID, $::CCPID) = splice @ARGV, ($i-1), 3;
+    $::isEmbedded = 1;
+}
 
 ################################################################################
 package pkgs_interactive;
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index f547c722a..08414be56 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -29,8 +29,6 @@ use common;
 use any;
 use c;
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
-
 local $_ = join '', @ARGV;
 
 my ($configure_this) = grep { !/^-/ } @ARGV;
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 97fca7bde..56f175b57 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -40,10 +40,7 @@ my %options;
 my @l = @ARGV;
 while (my $e = shift @l) {
     my ($option) = $e =~ /--?(.*)/ or next;
-    if ($option eq 'embedded') {
-	$::isEmbedded = 1;
-	($::XID, $::CCPID, @l) = @l;
-    } elsif ($option =~ /(.*?)=(.*)/) {
+    if ($option =~ /(.*?)=(.*)/) {
 	$options{$1} = $2;
     } else {
 	$options{$option} = '';
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index 80435789a..373c57994 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -65,7 +65,6 @@ my $nfs_subnet;
 my $nfs_mask;
 
 my $in = 'interactive'->vnew;
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\S*) (\S*)/;
 
 if ("@ARGV" =~ /--help|-h/) {
     print q(Mandrake Terminal Server Configurator
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index 73e57ee8a..f14951399 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -26,8 +26,6 @@ use commands;
 use fs;
 use Data::Dumper;
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
-
 
 local $_ = join '', @ARGV;
 
@@ -365,6 +363,11 @@ sub control_buttons {
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.21  2002/07/31 23:10:55  prigaux
+#- Handle parsing --embedded command line in standalone.pm
+#- => allows to remove the somewhat mythical
+#-      $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/
+#-
 #- Revision 1.20  2002/07/30 09:57:11  prigaux
 #- use $o->{interactiveSteps} instead of @install_steps_auto_install::graphical_steps
 #-
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 54cef99cc..81fde6849 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -131,7 +131,6 @@ use Time::localtime;
 
 
 my $in = 'interactive'->vnew('', 'default');
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 
 if ("@ARGV" =~ /--help|-h/) {
     print q(Backup and Restore application
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 174a40847..d28369627 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -13,7 +13,6 @@ use fsedit;
 use fs;
 use c;
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 local $_ = join '', @ARGV;
 
 /-h/ and die "usage: drakboot [--expert] [--testing]\n";
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index aceef3f82..8f60892a2 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -36,7 +36,6 @@ use network::adsl;
 use MDK::Common::Globals "network", qw($in $prefix $disconnect_file $connect_prog $connect_file $disconnect_file);
 
 my $xpm_path="/usr/share/libDrakX/pixmaps";
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 $::isWizard = "@ARGV" =~ /--wizard/;
 $::expert = "@ARGV" =~ /--expert/;
 local $_ = join '', @ARGV;
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index 6c59311ec..2cc0a3604 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -51,7 +51,6 @@ sub translate {
     $s ? c::dgettext('drakfloppy', $s) : '';
 }
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\S*) (\S*)/;
 if ($::isEmbedded) {
   print "EMBED\n";
   print "XID : $::XID\n";
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 8996aa0d6..d0f92deb3 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -93,7 +93,6 @@ use common;
 #use POSIX;
 
 my $in = 'interactive'->vnew( 'su', 'network' );
-$::isEmbedded = ( $::XID, $::CCPID ) = "@ARGV" =~ /--embedded (\S*) (\S*)/;
 
 if ( "@ARGV" =~ /--help|-h/ ) {
     print q(Font Importation and monitoring application
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 5dbb87c11..c16ec4514 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -34,8 +34,6 @@ use network::netconnect;
 $::isInstall and die "Not supported during install.\n";
 
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
-
 local $_ = join '', @ARGV;
 
 /-h/ and die "usage: drakgw [--version]\n";
@@ -613,6 +611,11 @@ Click on Configure to launch the setup wizard.", $setup_state));
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.64  2002/07/31 23:10:55  prigaux
+#- Handle parsing --embedded command line in standalone.pm
+#- => allows to remove the somewhat mythical
+#-      $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/
+#-
 #- Revision 1.63  2002/07/31 11:59:03  prigaux
 #- make new perl_checker happy
 #-
diff --git a/perl-install/standalone/drakproxy b/perl-install/standalone/drakproxy
index 07f624bbe..f912bb9ee 100755
--- a/perl-install/standalone/drakproxy
+++ b/perl-install/standalone/drakproxy
@@ -26,7 +26,6 @@ use network::network;
 
 $::o->{miscellaneous} ||= {};
 $::o->{miscellaneous} = { getVarsFromSh('/etc/profile.d/proxy.sh') };
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 my $in = 'interactive'->vnew('su', 'network');
 network::network::miscellaneousNetwork($in, 1, 1);
 any::miscellaneousNetwork('');
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index fa1ff2961..9f4002e96 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -14,7 +14,6 @@ local $_ = join '', @ARGV;
 /-h/ and die "usage: draksec [--expert]\n";
 
 $::expert = /-expert/ || cat_("/etc/sysconfig/system") =~ /^CLASS="?expert/m; #"
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 
 my $in = 'interactive'->vnew('su', 'security');
 
diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices
index f5249475b..5c19e2a2a 100755
--- a/perl-install/standalone/drakxservices
+++ b/perl-install/standalone/drakxservices
@@ -9,8 +9,6 @@ use interactive;
 use services;
 use log;
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
-
 local $_ = join '', @ARGV;
 
 /-h/ and die "usage: drakxservices\n";
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 6b0d1dfb8..ec02ba537 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -37,7 +37,7 @@ use common;
 
 ("@ARGV" =~ /--help|-h/) and die "usage: drakxtv [-h] [--help] [--no-guess]\n";
 
-#$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
+
 my $in = 'interactive'->vnew();
 
 sub scan4channels {
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 5085b79ee..a5b8f75b8 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -10,7 +10,6 @@ use Xconfig::xfree;
 use common;
 use c;
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 local $_ = join '', @ARGV;
 
 /-h/ and die _("usage: keyboarddrake [--expert] [keyboard]\n");
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 78c35b541..f9273c4ad 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -59,7 +59,6 @@ $::isInstall and die "Not supported during install.\n";
 
 my $in = 'interactive'->vnew('su', 'default');
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 if ($::isEmbedded) {
   print "EMBED\n";
   print "parent XID\t$::XID\n";
@@ -555,6 +554,11 @@ sub destroy_window {
 
 # log
 # $Log$
+# Revision 1.18  2002/07/31 23:10:55  prigaux
+# Handle parsing --embedded command line in standalone.pm
+# => allows to remove the somewhat mythical
+#      $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/
+#
 # Revision 1.17  2002/07/26 11:23:39  daouda
 # - more consistency when back button hit in wizard mode
 # - back button at last stage.
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index d3cc06e6c..145be22ef 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -11,7 +11,6 @@ use mouse;
 use c;
 
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 local $_ = join '', @ARGV;
 
 /-h/ and die "usage: mousedrake [--auto] [--testing]\n";
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index 72e15bf22..d7254ba99 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -60,7 +60,6 @@ if ($force) {
 $quiet and exit(0);
 init Gtk;
 my $in = 'interactive'->vnew('su', 'default');
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 
 
 my $window1 = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel;
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 501119148..2bbee5c31 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -27,7 +27,6 @@ use printerdrake;
 use printer;
 use c;
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 local $_ = join '', @ARGV;
 
 /-h/ and die "usage: printerdrake [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing] [--cups] [--lprng] [--lpd] [--pdq]\n";
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index b3b4dd402..5714cabe9 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -26,7 +26,6 @@ use interactive;
 use common;
 use scanner;
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 for (@ARGV) {
     /^--version$/ and die 'version: $Id$ '."\n";
     /^--help$/ and die 'logdrake [--version] [--help] [--manual] [--device=dev] [--update-sane=sane_desc_dir] [--update-usbtable] [--dynamic=dev]';
@@ -114,6 +113,11 @@ sub quit {
 
 #-----------------------------------------------
 # $Log$
+# Revision 1.12  2002/07/31 23:10:55  prigaux
+# Handle parsing --embedded command line in standalone.pm
+# => allows to remove the somewhat mythical
+#      $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/
+#
 # Revision 1.11  2002/03/11 06:43:36  yduret
 # re-re-re-re-re-re-uncomment the pkgs check line.
 #
diff --git a/perl-install/standalone/tinyfirewall b/perl-install/standalone/tinyfirewall
index 40dbd5f21..b924d2419 100755
--- a/perl-install/standalone/tinyfirewall
+++ b/perl-install/standalone/tinyfirewall
@@ -25,7 +25,6 @@ use standalone;     #- warning, standalone must be loaded very first, for 'expla
 use interactive;
 use tinyfirewall;
 
-$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 $::isWizard = "@ARGV" =~ /--wizard/;
 $::Wizard_pix_up = "wiz_firewall.png";
 $::Wizard_title = _("Firewalling Configuration");
-- 
cgit v1.2.1