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

Noticed that this directory may not exist so the mount fails.

bin/artix-live

@@ -32,4 +32,5 @@ echo "Configured accountsservice" >> "${LOGFILE}"
 configure_displaymanager
 echo "Configured displaymanager" >> "${LOGFILE}"
 
-
+configure_branding
+echo "Configured branding" >> "${LOGFILE}"

bin/desktop-items

@@ -12,23 +12,24 @@ src=/usr/share/applications
 #     $xdg/org.kde.konversation.desktop
 # fi
 
-# if [[ -f /usr/bin/calamares ]]; then
+if [[ -f /usr/bin/calamares ]]; then
-#     cp $src/calamares.desktop \
+    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g $src/calamares.desktop
-#     $xdg/calamares.desktop
+    cp -f $src/calamares.desktop "$xdg/"
-# fi
+    chmod +x "$xdg/calamares.desktop"
+fi
 
 docs=/usr/share/doc/artix
 
-for f in {Configuration,Troubleshooting}.pdf;do
+for f in {Configuration,Troubleshooting}.pdf; do
-    ln -s $docs/$f $xdg/$f
+    ln -s $docs/$f "$xdg"/$f
 done
 
-if [[ -d /run/openrc ]];then
+if [[ -d /run/openrc ]]; then
-    ln -s $docs/OpenRC.pdf $xdg/OpenRC.pdf
+    ln -s $docs/OpenRC.pdf "$xdg"/OpenRC.pdf
-elif [[ -d /run/runit ]];then
+elif [[ -d /run/runit ]]; then
-    ln -s $docs/Runit.pdf $xdg/Runit.pdf
+    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

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

data/s6/pacman-init/dependencies

@@ -1 +0,0 @@
-haveged

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 }

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