summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/install2.pm4
-rw-r--r--perl-install/install_any.pm4
-rw-r--r--perl-install/pkgs.pm16
4 files changed, 14 insertions, 12 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index dde389a4f..0d5e921bc 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -139,7 +139,7 @@ get_needed_files: $(SO_FILES)
cp -a consolefonts $(DEST)/usr/share
cp MonitorsDB $(DEST)/usr/share
cp logo-mandrake.xpm $(DEST)/usr/share
- cp compss $(ROOTDEST)/Mandrake/base
+ cp compss compssList $(ROOTDEST)/Mandrake/base
cp -f ../modules/modules.cpio.bz2 $(DEST)/lib/
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 4ca363782..ee52781af 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -262,6 +262,8 @@ $o = $::o = {
steps => \%installSteps,
orderedSteps => \@orderedInstallSteps,
+ installClass => "beginner",
+
base => [ qw(basesystem initscripts console-tools mkbootdisk linuxconf anacron linux_logo rhs-hwdiag utempter ldconfig chkconfig ntsysv mktemp setup setuptool filesystem MAKEDEV SysVinit ash at authconfig bash bdflush binutils console-tools crontabs dev e2fsprogs ed etcskel file fileutils findutils getty_ps gpm grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time timeconfig tmpwatch util-linux vim-minimal vixie-cron which cpio) ],
# for the list of fields available for user and superuser, see @etc_pass_fields in install_steps.pm
# user => { name => 'foo', password => 'bar', home => '/home/foo', shell => '/bin/bash', realname => 'really, it is foo' },
@@ -375,7 +377,7 @@ sub choosePackages {
}
sub doInstallStep {
- install_any::setPackages($o) unless $_[1];
+ install_any::setPackages($o) unless $_[1]; # FIXME
$o->beforeInstallPackages;
$o->installPackages($o->{packages});
$o->afterInstallPackages;
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 88e0acd66..ed0b65fee 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -18,7 +18,7 @@ use log;
1;
sub relGetFile($) {
- local $_ = member($_[0], qw(compss depslist hdlist)) ? "base" : "RPMS";
+ local $_ = member($_[0], qw(compss compssList depslist hdlist)) ? "base" : "RPMS";
$_ = "Mandrake/$_/$_[0]";
s/i386/i586/;
$_;
@@ -98,7 +98,7 @@ sub setPackages {
pkgs::setShowFromCompss($o->{compss}, $o->{installClass}, $o->{lang});
#PIXEL
- my $size = 10;
+ my $size = 100 << 20;
pkgs::setSelectedFromCompssList($o->{compssList}, $o->{packages},$size , $o->{installClass}, $o->{lang});
}
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index c3ccabe05..86480ab70 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -175,7 +175,8 @@ sub readCompssList($) {
if (/(.*):$/) {
$compssList{$1} = $list = [];
} else {
- my $p = $packages->{$_} or log::l("unknown package $_ (in compss)"), next;
+ chomp;
+ my $p = $packages->{$_} or log::l("unknown package $_ (in compssList)"), next;
push @$list, $p;
}
}
@@ -183,10 +184,11 @@ sub readCompssList($) {
}
sub verif_lang($$) {
- local $_ = shift;
- my $lang = shift;
+ my ($p, $lang) = @_;
local $SIG{__DIE__} = 'none';
- /-([^-]*)$/ && ($1 eq $lang || eval { lang::text2lang($1) eq $lang } && !$@);
+ $p->{options} =~ /l/ or return 1;
+ $p->{name} =~ /-([^-]*)$/ or return 1;
+ !($1 eq $lang || eval { lang::text2lang($1) eq $lang } && !$@);
}
sub setShowFromCompss($$$) {
@@ -198,7 +200,7 @@ sub setShowFromCompss($$$) {
$c->{show} = bool($c->{options} =~ /($l|\*)/);
foreach my $p (@{$c->{packages}}) {
local $_ = $p->{options};
- $p->{show} = /$l|\*/ && (!/l/ || verif_lang($p->{name}, $lang));
+ $p->{show} = /$l|\*/ && verif_lang($p, $lang);
}
}
}
@@ -208,9 +210,7 @@ sub setSelectedFromCompssList($$$$$) {
my $l = $compssList->{$install_class} or log::l("no $_ entry in compssList"), return;
foreach (@$l) {
- local $_ = $_->{options};
- /l/ && !verif_lang($_->{name}, $lang) and next;
-
+ verif_lang($_, $lang) or next;
&select($packages, $_);
my $nb = 0; foreach (values %$packages) {