diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-10-15 14:33:40 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-10-15 14:33:40 +0000 |
| commit | 4eb12bd3c2b072e0a8b1b22422104b8d71f245d1 (patch) | |
| tree | b7166f7ae34ab30580c417095318181c445cc6ba /move | |
| parent | 4bb042efd8ca9b9cf5f40e66187d9708877a79a5 (diff) | |
| download | drakx-4eb12bd3c2b072e0a8b1b22422104b8d71f245d1.tar drakx-4eb12bd3c2b072e0a8b1b22422104b8d71f245d1.tar.gz drakx-4eb12bd3c2b072e0a8b1b22422104b8d71f245d1.tar.bz2 drakx-4eb12bd3c2b072e0a8b1b22422104b8d71f245d1.tar.xz drakx-4eb12bd3c2b072e0a8b1b22422104b8d71f245d1.zip | |
have necessary png lang files installed and limit percent-langs of langs.pm accordingly
Diffstat (limited to 'move')
| -rw-r--r-- | move/Makefile | 5 | ||||
| -rwxr-xr-x | move/make_live | 2 | ||||
| -rw-r--r-- | move/move.pm | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/move/Makefile b/move/Makefile index 77712c765..d558d6b42 100644 --- a/move/Makefile +++ b/move/Makefile @@ -3,6 +3,7 @@ DEST_LIVETREE = /tmp/live_tree DEST_STAGE2 = $(DEST_LIVETREE)/usr/bin/stage2 DATA_FILES = devices symlinks +LANG_FILES = $(shell perl -ne 'print $$1 if /ALLOWED_LANGS = qw\((.*)\)/' move.pm) STAGE1 = ../mdk-stage1 INSTALL = ../perl-install @@ -26,6 +27,10 @@ install: build sudo cp -f *.pm $(DEST_STAGE2) sudo cp -f $(addprefix $(INSTALL)/, $(INSTALL_FILES)) $(DEST_STAGE2) + sudo rm -rf $(DEST_LIVETREE)/usr/share/langs + sudo mkdir -p $(DEST_LIVETREE)/usr/share/langs + sudo cp -f $(patsubst %, $(INSTALL)/pixmaps/langs/lang-%.png, $(LANG_FILES)) $(DEST_LIVETREE)/usr/share/langs + #- overwrite /usr/lib/libDrakX files of the live tree with those in CVS sudo cp -f $(addprefix $(INSTALL)/, $(shell cd $(DEST_LIVETREE)/usr/lib/libDrakX ; ls *.pm)) $(DEST_LIVETREE)/usr/lib/libDrakX || : diff --git a/move/make_live b/move/make_live index 2f0ba3679..06ba0280d 100755 --- a/move/make_live +++ b/move/make_live @@ -4,7 +4,7 @@ use lib "../perl-install"; use common; use pkgs; -my @langs = qw(fr en es it de); +my @langs = map { /^../; $& } split /\s/, (cat_('move.pm') =~ /ALLOWED_LANGS = qw\((.*)\)/)[0]; @ARGV == 0 or die "usage: make_live\n"; diff --git a/move/move.pm b/move/move.pm index b29a63ec3..d10e46822 100644 --- a/move/move.pm +++ b/move/move.pm @@ -8,7 +8,9 @@ use common; use fs; use run_program; use log; +use lang; +my @ALLOWED_LANGS = qw(en_US fr es it de); #- run very soon at stage2 start, setup things on tmpfs rw / that #- were not necessary to start stage2 itself (there were setup @@ -41,6 +43,8 @@ sub init { run_program::run('/sbin/devfsd', '/dev'); modules::load_category('multimedia/sound'); + + member($_, @ALLOWED_LANGS) or delete $lang::langs{$_} foreach keys %lang::langs; } |