summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Lécureuil <neoclust@mageia.org>2016-12-26 22:14:16 +0100
committerNicolas Lécureuil <neoclust@mageia.org>2016-12-26 22:14:16 +0100
commit8f0c0484cb1c23b3be6a58e698d9f6493c5103a3 (patch)
tree0e048ae452f799d0aa48ac8387d967fe717c7ecb
parent1b999f7a3f8a2f1baa1c27c8ac815ef2abebbd5c (diff)
downloadconfig-8f0c0484cb1c23b3be6a58e698d9f6493c5103a3.tar
config-8f0c0484cb1c23b3be6a58e698d9f6493c5103a3.tar.gz
config-8f0c0484cb1c23b3be6a58e698d9f6493c5103a3.tar.bz2
config-8f0c0484cb1c23b3be6a58e698d9f6493c5103a3.tar.xz
config-8f0c0484cb1c23b3be6a58e698d9f6493c5103a3.zip
Remove old desktop icons
-rw-r--r--etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh b/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh
index 36f23fd..e0a3fdf 100644
--- a/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh
+++ b/etc/xdg/plasma-workspace/env/plasma5-firstsetup.sh
@@ -110,6 +110,20 @@ EOF
kwriteconfig5 --group "Mageia" --key "IconsXdgDir" --type "bool" 1
fi
+ # "Desktop" Mageia icons"
+ MGA5to6=$(kreadconfig5 --group "Mageia" --key "Mageia5to6" --default "false")
+ if [ ! "$MGA5to6" = "true" ]; then
+ DIR=$(eval "echo $(kreadconfig5 --file $HOME/.config/user-dirs.dirs --key XDG_DESKTOP_DIR)" )
+ HOME="$DIR/Home2.desktop"
+ TRASH="$DIR/trash.desktop"
+ if [ -e "$HOME"]; then
+ rm -f "$HOME"
+ fi
+
+ if [ -e "$TRASH"]; then
+ rm -f "$TRASH"
+ fi
+ fi
# end of main if: all the changes should be done inside this main if
fi