summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-11-27 12:27:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-11-27 12:27:04 +0000
commit9470b4477a6745cd40256a13a66e82a96eea9cdd (patch)
tree66965aec820a8e5f3418bd9af1801306dd33a1a6
parentc8222044ee8e186be9cd76e4403a7894f0091fb8 (diff)
downloaddrakx-9470b4477a6745cd40256a13a66e82a96eea9cdd.tar
drakx-9470b4477a6745cd40256a13a66e82a96eea9cdd.tar.gz
drakx-9470b4477a6745cd40256a13a66e82a96eea9cdd.tar.bz2
drakx-9470b4477a6745cd40256a13a66e82a96eea9cdd.tar.xz
drakx-9470b4477a6745cd40256a13a66e82a96eea9cdd.zip
better have a good global /usr/share/services/ksycoca by linking it to the key,
rather than configuring it in every users .kde/share/services/ksycoca
-rwxr-xr-xmove/make_live2
-rw-r--r--move/move.pm5
2 files changed, 4 insertions, 3 deletions
diff --git a/move/make_live b/move/make_live
index e72aa417c..acf6c955b 100755
--- a/move/make_live
+++ b/move/make_live
@@ -104,6 +104,8 @@ print "Making live in $::prefix directory.\n";
eval { rm_rf("$::prefix/lib/i686") }; # de-complexify, use the default on any arch
+ symlinkf("/etc/X11/ksycoca", "$::prefix/usr/share/services/ksycoca");
+
config_X_proprietary_drivers();
unlink "$::prefix/usr/share/autostart/$_.desktop" foreach 'klipper', 'korgac', 'kalarmd.autostart';
diff --git a/move/move.pm b/move/move.pm
index 5b6486faa..abdf35575 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -408,14 +408,13 @@ sub install2::configMove {
mouse::write_conf($o, $o->{mouse}, 1); #- write xfree mouse conf
detect_devices::install_addons('');
+ symlinkf("/usr/share/services/ksycoca-$o->{locale}{lang}", '/etc/X11/ksycoca');
+
{
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");
}