From 5658174ffbb90d09fa5acc4da80f5e502fce9832 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Tue, 2 Dec 2003 17:36:03 +0000 Subject: update menus and kbuildsycoca need be done after we modify relevant files --- move/make_live | 29 +++++++++++++++-------------- 1 file 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 -- cgit v1.2.1