summaryrefslogtreecommitdiffstats
path: root/move/make_live
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-05-06 14:56:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-05-06 14:56:18 +0000
commit135dd9f4bffcc5790182c358dd7db2686c6f46b9 (patch)
treedc3f2e5954b23905c15d36d3fdc62e7d95b82c6b /move/make_live
parent74c5d63a6158dd39777a83299dead20dfc8a7e24 (diff)
downloaddrakx-backup-do-not-use-135dd9f4bffcc5790182c358dd7db2686c6f46b9.tar
drakx-backup-do-not-use-135dd9f4bffcc5790182c358dd7db2686c6f46b9.tar.gz
drakx-backup-do-not-use-135dd9f4bffcc5790182c358dd7db2686c6f46b9.tar.bz2
drakx-backup-do-not-use-135dd9f4bffcc5790182c358dd7db2686c6f46b9.tar.xz
drakx-backup-do-not-use-135dd9f4bffcc5790182c358dd7db2686c6f46b9.zip
- install all langs
- move default from /tmp/live_tree to /BIG/move/live_tree, and have it written only once
Diffstat (limited to 'move/make_live')
-rwxr-xr-xmove/make_live16
1 files changed, 7 insertions, 9 deletions
diff --git a/move/make_live b/move/make_live
index e9dc7ad45..5a092de09 100755
--- a/move/make_live
+++ b/move/make_live
@@ -3,9 +3,7 @@
use lib "../perl-install";
use common;
use pkgs;
-
-my @ALLOWED_LANGS = split(' ', first(cat_('move.pm') =~ /ALLOWED_LANGS = qw\((.*)\)/));
-my @langs = map { /^../; $& } @ALLOWED_LANGS;
+use lang;
@ARGV <= 1 or die "usage: make_live [live_location=/tmp/live_tree]\n";
@@ -17,7 +15,7 @@ my $kernel_version = do {
};
sub installPackages {
- output_p("$::prefix/etc/rpm/macros", "%_install_langs " . join(":", @langs) . "\n");
+ output_p("$::prefix/etc/rpm/macros", "%_install_langs all\n");
rename '/etc/rpm/macros', '/etc/rpm/macros.';
system('cp', "$::prefix/etc/rpm/macros", '/etc/rpm/macros');
@@ -79,7 +77,7 @@ sub installPackages {
my %compssUsersChoice = map { $_ => 1 } map { @{$_->{flags}} } values %{$o->{compssUsers}};
$compssUsersChoice{$_} = 1 foreach 'SYSTEM', 'DVD', 'USB', 'SOUND', 'BURNER', 'UTF8', 'DOCS', 'TV', '3D', 'INSTALL';
- $compssUsersChoice{qq(LOCALES"$_")} = 1 foreach @langs;
+ $compssUsersChoice{qq(LOCALES"$_")} = 1 foreach lang::list_langs();
#- we don't want those
foreach (qw(magicdev mdkonline)) {
@@ -120,7 +118,7 @@ sub config_X_proprietary_drivers {
substInFile { $_ = '' if /^nvidia$/ } "$::prefix/etc/modules";
}
-$::prefix = $ARGV[0] || '/tmp/live_tree';
+$::prefix = `make get_dest_livetree`;
print "Making live in $::prefix directory.\n";
eval { fs::umount("$::prefix/proc") };
@@ -220,11 +218,11 @@ run_program::rooted($::prefix, 'nspluginscan'); #- must be run before kbuildsyco
$ENV{HELP_BROWSER} = "kfmclient openProfile webbrowsing";
$ENV{BROWSER} = "kfmclient openProfile webbrowsing";
$ENV{DESKTOP} = "kde";
-foreach (@ALLOWED_LANGS) {
- $ENV{LC_ALL} = $_;
+foreach my $lang (lang::list_langs()) {
+ local $ENV{LC_ALL} = lang::getLANGUAGE($lang);
unlink "$::prefix/usr/share/services/ksycoca";
run_program::rooted($::prefix, 'kbuildsycoca', '--global');
- rename("$::prefix/usr/share/services/ksycoca", "$::prefix/usr/share/services/ksycoca-$_");
+ rename("$::prefix/usr/share/services/ksycoca", "$::prefix/usr/share/services/ksycoca-$lang");
}
symlinkf('/etc/X11/ksycoca', "$::prefix/usr/share/services/ksycoca");