[trunk] -> [extra] 'live-services-0.12.2-4' add

live-services/trunk/PKGBUILD

@@ -10,7 +10,7 @@ pkgname=('artix-live-base'
         'artix-live-suite66'
         'artix-live-dinit')
 pkgver=0.12.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Artix live session'
 arch=('any')
 url="https://gitea.artixlinux.org/artix/live-services"

live-services/x86_64/extra/PKGBUILD

@@ -10,7 +10,7 @@ pkgname=('artix-live-base'
         'artix-live-suite66'
         'artix-live-dinit')
 pkgver=0.12.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Artix live session'
 arch=('any')
 url="https://gitea.artixlinux.org/artix/live-services"

live-services/x86_64/extra/live-66.install

@@ -1,22 +1,40 @@
-# This will start "live" tree after boot
-# and also create default boot tree and
-# needed boot services
+# This will inject artix-live and pacman-init as dependencies for DMs
+# and create default boot tree and needed boot services
 
 post_install() {
+    if [ -f /usr/bin/gdm ]; then
+        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\
+'\1artix-live pacman-init )#' /etc/66/service/gdm
+        66-disable -t default logind gdm
+        66-enable -t default logind gdm
+    elif [ -f /usr/bin/lightdm ]; then
+        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\
+'\1artix-live pacman-init )#' /etc/66/service/lightdm
+        66-disable -t default logind lightdm
+        66-enable -t default logind lightdm
+    elif [ -f /usr/bin/sddm ]; then
+        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\
+'\1artix-live pacman-init )#' /etc/66/service/sddm
+        66-disable -t default logind sddm
+        66-enable -t default logind sddm
+    fi
+
     66-tree -n boot
     66-enable -t boot -F boot@system
+}
 
-    66-tree -nE live
-    66-enable -t live artix-live
-    66-enable -t live pacman-init
-
-    66-tree -n -S live -E post-live
-    66-disable -t default logind
-    if [ -f /usr/bin/sddm ]; then
-        66-enable -t post-live sddm
+post_remove() {
+    if [ -f /usr/bin/gdm ]; then
+        sed -i -E 's# artix-live pacman-init##' /etc/66/service/gdm
+        66-disable -t default logind gdm
+        66-enable -t default logind gdm
     elif [ -f /usr/bin/lightdm ]; then
-        66-enable -t post-live lightdm
-    elif [ -f /usr/bin/gdm ]; then
-        66-enable -t post-live gdm
+        sed -i -E 's# artix-live pacman-init##' /etc/66/service/lightdm
+        66-disable -t default logind lightdm
+        66-enable -t default logind lightdm
+    elif [ -f /usr/bin/sddm ]; then
+        sed -i -E 's# artix-live pacman-init##' /etc/66/service/sddm
+        66-disable -t default logind sddm
+        66-enable -t default logind sddm
     fi
 }