Mageia Bugzilla – Attachment 390 Details for
Bug 1190
some kde4-firstsetup.sh fixes and improvements
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
kde4-firstsetup.sh patch v2
kde4-firstsetup.sh.patch (text/plain), 4.59 KB, created by
Luc Menut
on 2011-05-12 00:50:08 CEST
(
hide
)
Description:
kde4-firstsetup.sh patch v2
Filename:
MIME Type:
Creator:
Luc Menut
Created:
2011-05-12 00:50:08 CEST
Size:
4.59 KB
patch
obsolete
>Index: kde4-firstsetup.sh >=================================================================== >--- kde4-firstsetup.sh (révision 95840) >+++ kde4-firstsetup.sh (copie de travail) >@@ -10,13 +10,15 @@ > > # Powersave applet > >- CFGFILE="/etc/sysconfig/harddrake2/kernel" > PSAVE=$(kreadconfig --group "Mageia" --key "PowersaveApplet" --default "false") > LAP=$(kreadconfig --file "/etc/sysconfig/harddrake2/kernel" --key IS_LAPTOP --default "false") > > if [ "$LAP" = "true" ]; then > if [ ! "$PSAVE" = "true" ]; then >- if [ ! -f "$HOME/.kde4/share/config/plasma-desktop-appletsrc" ]; then >+ MDVPSAVE=$(kreadconfig --group "Mandriva" --key "PowersaveApplet" --default "false") >+ if [ "$MDVPSAVE" = "true" ]; then >+ kwriteconfig --group "Mageia" --key "PowersaveApplet" --type "bool" 1 >+ elif [ ! -f "$HOME/.kde4/share/config/plasma-desktop-appletsrc" ]; then > mkdir -p $HOME/.kde4/share/config > cat >> $HOME/.kde4/share/config/plasma-desktop-appletsrc << EOF > >@@ -45,9 +47,9 @@ > > > # "Desktop" Mageia icons" >- PSAVE=$(kreadconfig --group "Mageia" --key "MageiaDesktopFiles" --default "false") >+ MGADESK=$(kreadconfig --group "Mageia" --key "MageiaDesktopFiles" --default "false") > >- if [ ! "$PSAVE" = "true" ]; then >+ if [ ! "$MGADESK" = "true" ]; then > # TODO: We need to handle default => Default too > PROD=$(sed 's/.*product=\(.*\)/\L\1/' < /etc/product.id) > # We should handle i18n dir modes in xgd user dirs >@@ -115,7 +117,7 @@ > > IAORAKDE=$(kreadconfig --group "Mageia" --key "IaOraKDE" --default "false") > >- if [ ! "$IAORAKDE" = "false" ]; then >+ if [ ! "$IAORAKDE" = "true" ]; then > IAORAQT=$(kreadconfig --group "General" --key "widgetStyle") > if [ "$IAORAQT" = "iaora-qt" ]; then > kwriteconfig --group "General" --key "widgetStyle" --type "string" "iaorakde" >@@ -262,8 +264,8 @@ > fi > kwriteconfig --group "Mageia" --key "IconMigration" --type "bool" 1 > fi >- fi > >+ > # We need to check desktop files created at first mdv start and remove or migrate for mageia > MIGRATE=$(kreadconfig --group "Mageia" --key "MdvMigrate" --default "false") > if [ ! "$MIGRATE" = "true" ]; then >@@ -280,5 +282,40 @@ > rm -f "${DIR}/upgrade.desktop" > fi > >+ for configFile in "$HOME/.kde4/share/config/kickoffrc" \ >+ "$HOME/.kde4/share/config/plasma-desktop-appletsrc" \ >+ "$HOME/.kde4/share/config/lancelotrc"; do >+ if [ -f $configFile ] && [ ! -f "$configFile.MdvToMga" ]; then >+ # save the config file before >+ cp -p $configFile "$configFile.MdvToMga" >+ # migrate mandriva-*.desktop to mageia-*.desktop >+ sed -i -e "s#/usr/share/applications/mandriva-\(.*\).desktop#/usr/share/applications/mageia-\1.desktop#g" $configFile >+ # migrate openoffice .desktop to libreoffice .desktop >+ for officeFile in base calc draw impress math startcenter writer; do >+ sed -i -e "s#/usr/share/applications/$officeFile.desktop#/usr/share/applications/libreoffice-$officeFile.desktop#g" $configFile >+ done >+ fi >+ done >+ # migrate lancelot system apps and newdocuments >+ if [ -h "$HOME/.kde4/share/apps/lancelot/systemservices/1_mandriva-drakconf.desktop" ] && [ -f /usr/share/applications/mageia-drakconf.desktop ]; then >+ rm -f "$HOME/.kde4/share/apps/lancelot/systemservices/1_mandriva-drakconf.desktop" >+ ln -sf /usr/share/applications/mageia-drakconf.desktop "$HOME/.kde4/share/apps/lancelot/systemservices/1_mageia-drakconf.desktop" >+ fi >+ if [ -h "$HOME/.kde4/share/apps/lancelot/newdocuments/1_writer.desktop" ] && [ -f /usr/share/applications/libreoffice-writer.desktop ]; then >+ rm -f "$HOME/.kde4/share/apps/lancelot/newdocuments/1_writer.desktop" >+ ln -sf /usr/share/applications/libreoffice-writer.desktop "$HOME/.kde4/share/apps/lancelot/newdocuments/1_libreoffice-writer.desktop" >+ fi >+ if [ -h "$HOME/.kde4/share/apps/lancelot/newdocuments/3_impress.desktop" ] && [ -f /usr/share/applications/libreoffice-impress.desktop ]; then >+ rm -f "$HOME/.kde4/share/apps/lancelot/newdocuments/3_impress.desktop" >+ ln -sf /usr/share/applications/libreoffice-impress.desktop "$HOME/.kde4/share/apps/lancelot/newdocuments/3_libreoffice-impress.desktop" >+ fi >+ if [ -h "$HOME/.kde4/share/apps/lancelot/newdocuments/5_calc.desktop" ] && [ -f /usr/share/applications/libreoffice-calc.desktop ]; then >+ rm -f "$HOME/.kde4/share/apps/lancelot/newdocuments/5_calc.desktop" >+ ln -sf /usr/share/applications/libreoffice-calc.desktop "$HOME/.kde4/share/apps/lancelot/newdocuments/5_libreoffice-calc.desktop" >+ fi > kwriteconfig --group "Mageia" --key "MdvMigrate" --type "bool" 1 > fi >+ >+# end of main if: all the changes should be done inside this main if >+fi >+
Index: kde4-firstsetup.sh =================================================================== --- kde4-firstsetup.sh (révision 95840) +++ kde4-firstsetup.sh (copie de travail) @@ -10,13 +10,15 @@ # Powersave applet - CFGFILE="/etc/sysconfig/harddrake2/kernel" PSAVE=$(kreadconfig --group "Mageia" --key "PowersaveApplet" --default "false") LAP=$(kreadconfig --file "/etc/sysconfig/harddrake2/kernel" --key IS_LAPTOP --default "false") if [ "$LAP" = "true" ]; then if [ ! "$PSAVE" = "true" ]; then - if [ ! -f "$HOME/.kde4/share/config/plasma-desktop-appletsrc" ]; then + MDVPSAVE=$(kreadconfig --group "Mandriva" --key "PowersaveApplet" --default "false") + if [ "$MDVPSAVE" = "true" ]; then + kwriteconfig --group "Mageia" --key "PowersaveApplet" --type "bool" 1 + elif [ ! -f "$HOME/.kde4/share/config/plasma-desktop-appletsrc" ]; then mkdir -p $HOME/.kde4/share/config cat >> $HOME/.kde4/share/config/plasma-desktop-appletsrc << EOF @@ -45,9 +47,9 @@ # "Desktop" Mageia icons" - PSAVE=$(kreadconfig --group "Mageia" --key "MageiaDesktopFiles" --default "false") + MGADESK=$(kreadconfig --group "Mageia" --key "MageiaDesktopFiles" --default "false") - if [ ! "$PSAVE" = "true" ]; then + if [ ! "$MGADESK" = "true" ]; then # TODO: We need to handle default => Default too PROD=$(sed 's/.*product=\(.*\)/\L\1/' < /etc/product.id) # We should handle i18n dir modes in xgd user dirs @@ -115,7 +117,7 @@ IAORAKDE=$(kreadconfig --group "Mageia" --key "IaOraKDE" --default "false") - if [ ! "$IAORAKDE" = "false" ]; then + if [ ! "$IAORAKDE" = "true" ]; then IAORAQT=$(kreadconfig --group "General" --key "widgetStyle") if [ "$IAORAQT" = "iaora-qt" ]; then kwriteconfig --group "General" --key "widgetStyle" --type "string" "iaorakde" @@ -262,8 +264,8 @@ fi kwriteconfig --group "Mageia" --key "IconMigration" --type "bool" 1 fi - fi + # We need to check desktop files created at first mdv start and remove or migrate for mageia MIGRATE=$(kreadconfig --group "Mageia" --key "MdvMigrate" --default "false") if [ ! "$MIGRATE" = "true" ]; then @@ -280,5 +282,40 @@ rm -f "${DIR}/upgrade.desktop" fi + for configFile in "$HOME/.kde4/share/config/kickoffrc" \ + "$HOME/.kde4/share/config/plasma-desktop-appletsrc" \ + "$HOME/.kde4/share/config/lancelotrc"; do + if [ -f $configFile ] && [ ! -f "$configFile.MdvToMga" ]; then + # save the config file before + cp -p $configFile "$configFile.MdvToMga" + # migrate mandriva-*.desktop to mageia-*.desktop + sed -i -e "s#/usr/share/applications/mandriva-\(.*\).desktop#/usr/share/applications/mageia-\1.desktop#g" $configFile + # migrate openoffice .desktop to libreoffice .desktop + for officeFile in base calc draw impress math startcenter writer; do + sed -i -e "s#/usr/share/applications/$officeFile.desktop#/usr/share/applications/libreoffice-$officeFile.desktop#g" $configFile + done + fi + done + # migrate lancelot system apps and newdocuments + if [ -h "$HOME/.kde4/share/apps/lancelot/systemservices/1_mandriva-drakconf.desktop" ] && [ -f /usr/share/applications/mageia-drakconf.desktop ]; then + rm -f "$HOME/.kde4/share/apps/lancelot/systemservices/1_mandriva-drakconf.desktop" + ln -sf /usr/share/applications/mageia-drakconf.desktop "$HOME/.kde4/share/apps/lancelot/systemservices/1_mageia-drakconf.desktop" + fi + if [ -h "$HOME/.kde4/share/apps/lancelot/newdocuments/1_writer.desktop" ] && [ -f /usr/share/applications/libreoffice-writer.desktop ]; then + rm -f "$HOME/.kde4/share/apps/lancelot/newdocuments/1_writer.desktop" + ln -sf /usr/share/applications/libreoffice-writer.desktop "$HOME/.kde4/share/apps/lancelot/newdocuments/1_libreoffice-writer.desktop" + fi + if [ -h "$HOME/.kde4/share/apps/lancelot/newdocuments/3_impress.desktop" ] && [ -f /usr/share/applications/libreoffice-impress.desktop ]; then + rm -f "$HOME/.kde4/share/apps/lancelot/newdocuments/3_impress.desktop" + ln -sf /usr/share/applications/libreoffice-impress.desktop "$HOME/.kde4/share/apps/lancelot/newdocuments/3_libreoffice-impress.desktop" + fi + if [ -h "$HOME/.kde4/share/apps/lancelot/newdocuments/5_calc.desktop" ] && [ -f /usr/share/applications/libreoffice-calc.desktop ]; then + rm -f "$HOME/.kde4/share/apps/lancelot/newdocuments/5_calc.desktop" + ln -sf /usr/share/applications/libreoffice-calc.desktop "$HOME/.kde4/share/apps/lancelot/newdocuments/5_libreoffice-calc.desktop" + fi kwriteconfig --group "Mageia" --key "MdvMigrate" --type "bool" 1 fi + +# end of main if: all the changes should be done inside this main if +fi +
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1190
:
359
| 390