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 · 2020-11-22 02:56:01 +02:00
6 changed files with 23 additions and 15 deletions
--- a/bin/artix-live
+++ b/bin/artix-live
@@ -32,4 +32,5 @@ echo "Configured accountsservice" >> "${LOGFILE}"
 configure_displaymanager
 echo "Configured displaymanager" >> "${LOGFILE}"

-
+configure_branding
+echo "Configured branding" >> "${LOGFILE}"
--- a/bin/desktop-items
+++ b/bin/desktop-items
@@ -12,23 +12,24 @@ src=/usr/share/applications
 #     $xdg/org.kde.konversation.desktop
 # fi

-# if [[ -f /usr/bin/calamares ]]; then
-#     cp $src/calamares.desktop \
-#     $xdg/calamares.desktop
-# fi
+if [[ -f /usr/bin/calamares ]]; then
+    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

-for f in {Configuration,Troubleshooting}.pdf;do
-    ln -s $docs/$f $xdg/$f
+for f in {Configuration,Troubleshooting}.pdf; do
+    ln -s $docs/$f "$xdg"/$f
 done

-if [[ -d /run/openrc ]];then
-    ln -s $docs/OpenRC.pdf $xdg/OpenRC.pdf
-elif [[ -d /run/runit ]];then
-    ln -s $docs/Runit.pdf $xdg/Runit.pdf
+if [[ -d /run/openrc ]]; then
+    ln -s $docs/OpenRC.pdf "$xdg"/OpenRC.pdf
+elif [[ -d /run/runit ]]; then
+    ln -s $docs/Runit.pdf "$xdg"/Runit.pdf
 else
-    ln -s $docs/S6.pdf $xdg/S6.pdf
+    ln -s $docs/S6.pdf "$xdg"/S6.pdf
 fi

-echo "live session details: /var/log/artix-live.log" > $xdg/README.txt
+echo "live session details: /var/log/artix-live.log" > "$xdg"/README.txt
--- 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
--- a/data/s6/pacman-init/dependencies
+++ b/data/s6/pacman-init/dependencies
@@ -1 +0,0 @@
-haveged
--- a/data/s6/pacman-init/up
+++ b/data/s6/pacman-init/up
@@ -1,4 +1,5 @@
 #!/usr/bin/execlineb -P
+foreground { mkdir -p /etc/pacman.d/gnupg }
 foreground { mount -t tmpfs -o size=10M,mode=0755 tmpfs /etc/pacman.d/gnupg }
 fdmove -c 2 1
 foreground { pacman-key --init }
--- a/lib/util-live.sh
+++ b/lib/util-live.sh
@@ -244,6 +244,12 @@ configure_swap(){
    fi
 }

+configure_branding(){
+    if [[ -f /usr/bin/neofetch ]]; then
+        neofetch >| /etc/issue
+    fi
+}
+
 configure_user(){
    local user="$1"
    if [[ "$user" == 'root' ]];then
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
nous	b0accd6320	fix i18n symlinking and reinstate calamares	2020-11-22 02:56:01 +02:00
artoo	186c4cc944	check for neofetch	2020-07-26 16:29:42 +02:00
artoo	36b3def4df	Merge pull request 'set branding' (#4 ) from neo into master	2020-07-26 16:27:49 +02:00
artoo	bff662b2bb	remeove s6 pacman-init dependencies file	2020-07-26 16:26:06 +02:00
artoo	6a830fd09e	Merge pull request 'pacman-init: make sure /etc/pacman.d/gnupg exists' (#5 ) from s6-fix into master	2020-03-21 19:49:51 +01:00
dudemanguy	f1a229a2b2	pacman-init: make sure /etc/pacman.d/gnupg exists Noticed that this directory may not exist so the mount fails.	2020-01-17 22:33:28 -06:00
artoo	8163c1574f	set branding	2019-12-23 21:23:28 +01:00