summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-12-02 17:36:03 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-12-02 17:36:03 +0000
commit5658174ffbb90d09fa5acc4da80f5e502fce9832 (patch)
treeed2eb77aef64fe2de223e968afc295e1ed273616
parent50abc2ec7f6fd244f7e270e9609f051bd95e02b5 (diff)
downloaddrakx-5658174ffbb90d09fa5acc4da80f5e502fce9832.tar
drakx-5658174ffbb90d09fa5acc4da80f5e502fce9832.tar.gz
drakx-5658174ffbb90d09fa5acc4da80f5e502fce9832.tar.bz2
drakx-5658174ffbb90d09fa5acc4da80f5e502fce9832.tar.xz
drakx-5658174ffbb90d09fa5acc4da80f5e502fce9832.zip
update menus and kbuildsycoca need be done after we modify relevant files
-rwxr-xr-xmove/make_live29
1 files changed, 15 insertions, 14 deletions
diff --git a/move/make_live b/move/make_live
index 3af4aba72..171512d44 100755
--- a/move/make_live
+++ b/move/make_live
@@ -97,22 +97,8 @@ print "Making live in $::prefix directory.\n";
installPackages();
run_program::rooted($::prefix, 'ldconfig');
any::fix_broken_alternatives();
- touch("$::prefix/etc/menu/enable_simplified");
- $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, 'nspluginscan'); #- must be run before kbuildsycoca for the ksycoca to be flash plugin aware
-
- $ENV{HELP_BROWSER} = "kfmclient openProfile webbrowsing";
- $ENV{BROWSER} = "kfmclient openProfile webbrowsing";
- $ENV{DESKTOP} = "kde";
- foreach (@ALLOWED_LANGS) {
- $ENV{LC_ALL} = $_;
- run_program::rooted($::prefix, 'kbuildsycoca');
- cp_af("$::prefix/tmp/kde-root/ksycoca", "$::prefix/usr/share/services/ksycoca-$_");
- }
-
}
@@ -177,6 +163,21 @@ substInFile {
#- remove "Login Manager" module from kcontrol
unlink "$::prefix/usr/lib/menu/kdebase-kdm";
+touch("$::prefix/etc/menu/enable_simplified");
+$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, 'nspluginscan'); #- must be run before kbuildsycoca for the ksycoca to be flash plugin aware
+
+$ENV{HELP_BROWSER} = "kfmclient openProfile webbrowsing";
+$ENV{BROWSER} = "kfmclient openProfile webbrowsing";
+$ENV{DESKTOP} = "kde";
+foreach (@ALLOWED_LANGS) {
+ $ENV{LC_ALL} = $_;
+ run_program::rooted($::prefix, 'kbuildsycoca');
+ cp_af("$::prefix/tmp/kde-root/ksycoca", "$::prefix/usr/share/services/ksycoca-$_");
+}
+
#- Mandrake