summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-01-01 17:09:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-01-01 17:09:26 +0000
commitd004436dc848800c9d65b90e39c39836c4d44cdf (patch)
treeb37bdcac9dad762a2b692076522785a83533c5f6 /perl-install/install_any.pm
parent1dc94110fc837dbe6cf06806f60c207ab1b64e83 (diff)
downloaddrakx-d004436dc848800c9d65b90e39c39836c4d44cdf.tar
drakx-d004436dc848800c9d65b90e39c39836c4d44cdf.tar.gz
drakx-d004436dc848800c9d65b90e39c39836c4d44cdf.tar.bz2
drakx-d004436dc848800c9d65b90e39c39836c4d44cdf.tar.xz
drakx-d004436dc848800c9d65b90e39c39836c4d44cdf.zip
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm27
1 files changed, 18 insertions, 9 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 11b9c56a2..7d1e6563c 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -32,8 +32,9 @@ use log;
#-######################################################################################
sub relGetFile($) {
local $_ = $_[0];
+ /\.img$/ and return "images/$_";
my $dir = m|/| ? "mdkinst" :
- (member($_, qw(compss compssList compssUsers depslist hdlist)) ? "base" : "RPMS");
+ member($_, qw(compss compssList compssUsers depslist hdlist)) ? "base" : "RPMS";
$_ = "Mandrake/$dir/$_";
s/i386/i586/;
$_;
@@ -174,7 +175,7 @@ sub getHds {
my ($ok, $ok2) = 1;
my @drives = detect_devices::hds();
- add2hash_($o->{partitioning}, { readonly => 1 }) if partition_table_raw::typeOfMBR($drives[0]{device}) eq 'system_commander';
+# add2hash_($o->{partitioning}, { readonly => 1 }) if partition_table_raw::typeOfMBR($drives[0]{device}) eq 'system_commander';
getHds:
$o->{hds} = catch_cdie { fsedit::hds(\@drives, $o->{partitioning}) }
@@ -413,7 +414,7 @@ sub g_auto_install(;$) {
my @fields = qw(mntpoint type size);
$o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
- exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade manualFstab nomouseprobe crypto modem useSupermount); #- TODO modules bootloader
+ exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse wacom netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade manualFstab nomouseprobe crypto modem useSupermount); #- TODO modules bootloader
if (my $card = $::o->{X}{card}) {
$o->{X}{card}{$_} = $card->{$_} foreach qw(default_depth);
@@ -597,27 +598,27 @@ sub kdeicons_postinstall($) {
foreach (<F>) {
if (m|^/dev/(\S+)\s+/mnt/cdrom(\d*)\s+|) {
my %toreplace = ( device => $1, id => $2 );
- template2userfile($prefix, "/usr/share/cdrom.fsdev.kdelnk.in", "Desktop/Cd-Rom". ($2 && "_$2") .".kdelnk",
+ template2userfile($prefix, "/usr/share/cdrom.fsdev.kdelnk.in", "Desktop/Cd-Rom". ($2 && " $2") .".kdelnk",
1, %toreplace);
} elsif (m|^/dev/(\S+)\s+/mnt/zip(\d*)\s+|) {
my %toreplace = ( device => $1, id => $2 );
- template2userfile($prefix, "/usr/share/zip.fsdev.kdelnk.in", "Desktop/Zip". ($2 && "_$2") .".kdelnk",
+ template2userfile($prefix, "/usr/share/zip.fsdev.kdelnk.in", "Desktop/Zip". ($2 && " $2") .".kdelnk",
1, %toreplace);
} elsif (m|^/dev/(\S+)\s+/mnt/floppy(\d*)\s+|) {
my %toreplace = ( device => $1, id => $2 );
- template2userfile($prefix, "/usr/share/floppy.fsdev.kdelnk.in", "Desktop/Floppy". ($2 && "_$2") .".kdelnk",
+ template2userfile($prefix, "/usr/share/floppy.fsdev.kdelnk.in", "Desktop/Floppy". ($2 && " $2") .".kdelnk",
1, %toreplace);
} elsif (m|^/mnt/cdrom(\d*)\s+/mnt/cdrom\d*\s+supermount|) {
my %toreplace = ( id => $1 );
- template2userfile($prefix, "/usr/share/cdrom.kdelnk.in", "Desktop/Cd-Rom". ($1 && "_$1") .".kdelnk",
+ template2userfile($prefix, "/usr/share/cdrom.kdelnk.in", "Desktop/Cd-Rom". ($1 && " $1") .".kdelnk",
1, %toreplace);
} elsif (m|^/mnt/zip(\d*)\s+/mnt/zip\d*\s+supermount|) {
my %toreplace = ( id => $1 );
- template2userfile($prefix, "/usr/share/zip.kdelnk.in", "Desktop/Zip". ($1 && "_$1") .".kdelnk",
+ template2userfile($prefix, "/usr/share/zip.kdelnk.in", "Desktop/Zip". ($1 && " $1") .".kdelnk",
1, %toreplace);
} elsif (m|^/mnt/floppy(\d*)\s+/mnt/floppy\d*\s+supermount|) {
my %toreplace = ( id => $1 );
- template2userfile($prefix, "/usr/share/floppy.kdelnk.in", "Desktop/Floppy". ($1 && "_$1") .".kdelnk",
+ template2userfile($prefix, "/usr/share/floppy.kdelnk.in", "Desktop/Floppy". ($1 && " $1") .".kdelnk",
1, %toreplace);
} elsif (m|^/dev/(\S+)\s+(/mnt/DOS_\S*)\s+|) {
my %toreplace = ( device => $1, id => $2, mntpoint => $2 );
@@ -627,6 +628,14 @@ sub kdeicons_postinstall($) {
template2userfile($prefix, "/usr/share/Dos_.kdelnk.in", "Desktop/Dos_$1.kdelnk", 1, %toreplace);
}
}
+ my $lang = quotemeta $ENV{LANG};
+ foreach my $dir (map { "$prefix$_/Desktop" } qw(/etc/skel /root)) {
+ -d $dir or next;
+ foreach (grep { /\.kdelnk$/ } all($dir)) {
+ cat_("$dir/$_") =~ /^Name\[$lang\]=(.*)/m
+ and rename "$dir/$_", "$dir/$1.kdelnk";
+ }
+ }
}
sub move_desktop_file($) {