- configure ksycoca per lang

- configure ksycoca with flag working
- configure kdeglobals lang (for kcontrol and a few more)

2 files changed, 21 insertions, 2 deletions

diff --git a/move/make_live b/move/make_live
index 2af7b7093..07f6b5233 100755
--- a/move/make_live
+++ b/move/make_live
@@ -93,7 +93,14 @@ print "Making live in $::prefix directory.\n";
     $ENV{LC_ALL} = 'en_US'; #- update-menus doesn't work when there is no locale (aka locale "C")
     run_program::rooted($::prefix, 'update-menus', '-n');
     run_program::rooted($::prefix, 'fc-cache');  #- generate cache in all directories mentioned in config file
-    run_program::rooted($::prefix, 'kbuildsycoca', '--global');
+
+    run_program::rooted($::prefix, 'nspluginscan'); #- must be run before kbuildsycoca for the ksycoca to be flash plugin aware
+    foreach (@langs) {
+	$ENV{LC_ALL} = $_;
+	run_program::rooted($::prefix, 'kbuildsycoca');
+	cp_af("$::prefix/tmp/kde-root/ksycoca", "$::prefix/usr/share/services/ksycoca-$_");
+    }
+
     eval { rm_rf("$::prefix/lib/i686") }; # de-complexify, use the default on any arch
 
     config_X_proprietary_drivers();
diff --git a/move/move.pm b/move/move.pm
index 864f8a7e3..61e9041fc 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -140,6 +140,7 @@ sub init {
     key_installfiles('simple');
     if (`getent passwd 501` =~ /([^:]+):/) {
         $o->{users} = [ { name => $1 } ];
+	$ENV{HOME} = "/home/$1"; #- used by lang::read()  :-/
         print "using existing user configuration\n";
         $using_existing_user_config = 1;
     }
@@ -148,7 +149,7 @@ sub init {
         $using_existing_host_config = 1;
     }
     if (-s '/etc/sysconfig/i18n') {
-        lang::set($o->{locale} = lang::read('', 0));
+        lang::set($o->{locale} = lang::read('', 0)); #- read ~/.i18n first if it exists
 	install2::handleI18NClp();
     }
 
@@ -402,6 +403,17 @@ sub install2::configMove {
     mouse::write_conf($o, $o->{mouse}, 1);  #- write xfree mouse conf
     detect_devices::install_addons('');
 
+    {
+	my $user = $o->{users}[0]{name};
+	cp_af("/usr/share/config/kdeglobals", $confdir);
+	lang::configure_kdeglobals($o->{locale}, "/home/$user/.kde/share/config");
+
+	mkdir_p("/home/$user/.kde/share/services");
+	cp_af("/usr/share/services/ksycoca-$o->{locale}{lang}", "/home/$user/.kde/share/services/ksycoca");
+
+        run_program::run('chown', '-R', "$user.$user", "/home/$user/.kde");
+    }
+
     foreach my $step (@{$o->{orderedSteps_orig}}) {
         next if member($step, @{$o->{orderedSteps}});
         while (my $f = shift @{$o->{steps}{$step}{toBeDone} || []}) {