From 38dce4a6d02d689b7aefa2b5f925ac5441c51a89 Mon Sep 17 00:00:00 2001
From: pad <pad@mandriva.com>
Date: Sun, 5 Sep 1999 21:28:36 +0000
Subject: code clarification + bugfix

---
 perl-install/install_steps.pm | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 9c5473c49..b9ffd80ee 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -24,18 +24,14 @@ use network;
 use fs;
 
 
-my $o;
-
-1;
-
-
 #-######################################################################################
-#- misc functions
+#- OO Stuff
 #-######################################################################################
 sub new($$) {
-    my ($type, $o_) = @_;
-
-    $o = bless $o_, ref $type || $type;
+    my ($type, $o) = @_;
+    
+    bless $o, ref $type || $type;
+    return $o;
 }
 
 #-######################################################################################
@@ -84,11 +80,15 @@ sub errorInStep($$) {}
 #-######################################################################################
 #------------------------------------------------------------------------------
 sub selectLanguage {
+    my ($o) = @_;
     $o->{keyboard} ||= keyboard::lang2keyboard($o->{lang});
     selectKeyboard($o);
 }
 #------------------------------------------------------------------------------
-sub selectKeyboard { keyboard::setup($o->{keyboard}) }
+sub selectKeyboard { 
+    my ($o) = @_;
+    keyboard::setup($o->{keyboard}) 
+  }
 #------------------------------------------------------------------------------
 sub selectPath {}
 #------------------------------------------------------------------------------
@@ -261,6 +261,7 @@ sub addUser($) {
 
 #------------------------------------------------------------------------------
 sub createBootdisk($) {
+    my ($o) = @_;
     my $dev = $o->{mkbootdisk} or return;
 
     my @l = detect_devices::floppies();
@@ -288,3 +289,8 @@ sub setupXfree {
 
 #------------------------------------------------------------------------------
 sub exitInstall {}
+
+#-######################################################################################
+#- Wonderful perl :(
+#-######################################################################################
+1; # 
-- 
cgit v1.2.1