removed MergeDir message from post install/upgrade functions

This commit is contained in:
Giuseppe 2012-10-15 15:46:07 +00:00
parent ecc25b22ef
commit 03a5d5a8be
2 changed files with 1 additions and 35 deletions

View File

@ -5,7 +5,7 @@
pkgname=wine
pkgver=1.5.15
pkgrel=1
pkgrel=2
_pkgbasever=${pkgver/rc/-rc}

View File

@ -6,23 +6,6 @@ post_upgrade() {
echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
echo "See the Arch wiki on wine for more information."
echo ""
echo ""
echo "KDE 4 Menu Fix"
echo "The Wine menu items may appear in 'Lost & Found' instead of the Wine menu for KDE 4."
echo "This is because kde-applications.menu is missing the MergeDir option."
echo "Edit /etc/xdg/menus/kde-applications.menu"
echo "At the end of the file add <MergeDir>applications-merged</MergeDir> after <DefaultMergeDirs/>, "
echo "it should look like this:"
echo " <Include>"
echo " <And>"
echo " <Category>KDE</Category>"
echo " <Category>Core</Category>"
echo " </And>"
echo " </Include>"
echo " <DefaultMergeDirs/>"
echo " <MergeDir>applications-merged</MergeDir> <!-- ADD THIS -->"
echo " <MergeFile>applications-kmenuedit.menu</MergeFile>"
echo "</Menu>"
}
post_install() {
@ -33,23 +16,6 @@ post_install() {
echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
echo "See the Arch wiki on wine for more information."
echo ""
echo ""
echo "KDE 4 Menu Fix"
echo "The Wine menu items may appear in 'Lost & Found' instead of the Wine menu for KDE 4."
echo "This is because kde-applications.menu is missing the MergeDir option."
echo "Edit /etc/xdg/menus/kde-applications.menu"
echo "At the end of the file add <MergeDir>applications-merged</MergeDir> after <DefaultMergeDirs/>, "
echo "it should look like this:"
echo " <Include>"
echo " <And>"
echo " <Category>KDE</Category>"
echo " <Category>Core</Category>"
echo " </And>"
echo " </Include>"
echo " <DefaultMergeDirs/>"
echo " <MergeDir>applications-merged</MergeDir> <!-- ADD THIS -->"
echo " <MergeFile>applications-kmenuedit.menu</MergeFile>"
echo "</Menu>"
}
post_remove() {