Merge branch 'master' of https://gitea.artixlinux.org/artix/live-services

change calamares icon in i18n
change order of plasma, to fix community-qt default DE
2020-11-27 15:56:48 +02:00 · 2020-11-27 15:56:27 +02:00 · 2020-11-25 16:25:13 +01:00 · 2020-11-24 17:39:34 +02:00 · 2020-11-24 17:37:00 +02:00
2 changed files with 4 additions and 2 deletions
--- a/bin/desktop-items
+++ b/bin/desktop-items
@@ -13,7 +13,9 @@ src=/usr/share/applications
 # fi

 if [[ -f /usr/bin/calamares ]]; then
-    cp $src/calamares.desktop "$xdg"/calamares.desktop
+    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g $src/calamares.desktop
+    cp -f $src/calamares.desktop "$xdg/"
+    chmod +x "$xdg/calamares.desktop"
 fi

 docs=/usr/share/doc/artix
--- a/data/desktop.map
+++ b/data/desktop.map
@@ -7,6 +7,7 @@ pekwm:pekwm
 enlightenment:enlightenment_start
 Lumina-DE:start-lumina-desktop
 LXDE:lxsession
+plasma:startkde
 lxqt:lxqt-session
 pantheon:pantheon-session
 budgie-desktop:budgie-desktop
@@ -15,4 +16,3 @@ mate:mate-session
 cinnamon:cinnamon-session-cinnamon
 xfce:startxfce4
 gnome:gnome-session
-plasma:startkde
Author	SHA1	Message	Date
nous	759f8236f1	Merge branch 'master' of https://gitea.artixlinux.org/artix/live-services	2020-11-27 15:56:48 +02:00
nous	51017c4789	change calamares icon in i18n	2020-11-27 15:56:27 +02:00
nous	9fafba1f67	change order of plasma, to fix community-qt default DE	2020-11-25 16:25:13 +01:00
nous	1bb3f828fe	force copy just in case	2020-11-24 17:39:34 +02:00
nous	76618b8ffe	fix calamares not shown correctly in MATE and Cinnamon	2020-11-24 17:37:00 +02:00