adapt to new service scheme

Reviewed-on: artix/live-services#12

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.13.1
+VERSION = 0.13.8
 
 PKG = live-services
 TOOLS = artools
@@ -40,6 +40,10 @@ RUNIT_SVD = \
 RUNIT_SV = \
 	data/runit/pacman-init.run
 
+S6_DEFAULT = \
+	data/s6/default/contents.d/artix-live \
+	data/s6/default/contents.d/pacman-init
+
 S6_LIVE = \
 	data/s6/artix-live/up \
 	data/s6/artix-live/type
@@ -125,14 +129,18 @@ install_runit:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
 	install $(BMODE) $(RUNIT_SV) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init/run
 
-install_s6: install_alpm
+install_s6:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/adminsv
+
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/adminsv/default/contents.d
+	install $(FMODE) $(S6_DEFAULT) $(DESTDIR)$(SYSCONFDIR)/s6/adminsv/default/contents.d/
 
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init
-	install $(BMODE) $(S6_PI) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init/
+	install $(FMODE) $(S6_PI) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init/
 
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live
-	install $(BMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/
+	install $(FMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/
 
 install_66: install_alpm
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/66/service
@@ -141,13 +149,13 @@ install_66: install_alpm
 	install $(FMODE) $(66_PI) $(DESTDIR)$(SYSCONFDIR)/66/service/pacman-init
 
 install_dinit:
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/scripts
+	install $(DMODE) $(DESTDIR)$(LIBDIR)/dinit
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/boot.d
 	install $(FMODE) $(DINIT_LIVE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/artix-live
 	install $(FMODE) $(DINIT_PI) $(DESTDIR)$(SYSCONFDIR)/dinit.d/pacman-init
-	install $(BMODE) $(DINIT_PI_SCRIPT) $(DESTDIR)$(SYSCONFDIR)/dinit.d/scripts/pacman-init
+	install $(BMODE) $(DINIT_PI_SCRIPT) $(DESTDIR)$(LIBDIR)/dinit/pacman-init
-	ln -s ../artix-live $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
+	ln -s ../artix-live $(DESTDIR)$(SYSCONFDIR)/dinit.d/boot.d
-	ln -s ../pacman-init $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
+	ln -s ../pacman-init $(DESTDIR)$(SYSCONFDIR)/dinit.d/boot.d
 
 install_xdg:
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin

README.md

@@ -1 +1,3 @@
 # live-services
+
+Live ISO setup, branding, installer for DE ISOs etc.

bin/desktop-items.in

@@ -7,15 +7,17 @@ xdg-user-dirs-update --force
 xdg=$(xdg-user-dir DESKTOP)
 src=@datadir@/applications
 
-# if [[ -f $src/org.kde.konversation.desktop ]]; then
+# if [ -f $src/org.kde.konversation.desktop ]; then
 #     install -m644 $src/org.kde.konversation.desktop \
 #     $xdg/org.kde.konversation.desktop
 # fi
 
-if [[ -f @bindir@/calamares ]]; then
+if [ -f @bindir@/calamares ]; then
-    cp -f $src/calamares.desktop "$xdg/"
+    installer='calamares.desktop'
-    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g "$xdg"/calamares.desktop
+    cp -f $src/$installer "$xdg/"
-    chmod +x "$xdg/calamares.desktop"
+    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g "$xdg"/$installer
+    sed -r -i "s|XAUTHCOOKIE|$XAUTHORITY|" "$xdg"/$installer
+    chmod +x "$xdg/$installer"
 fi
 
 docs=@datadir@/doc/artix
@@ -24,13 +26,13 @@ for f in {Configuration,Troubleshooting}.pdf; do
     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
-elif [[ -d /run/runit ]]; then
+elif [ -d /run/runit ]; then
     ln -s $docs/Runit.pdf "$xdg"/Runit.pdf
-elif [[ -d /run/66 ]]; then
+elif [ -d /run/66 ]; then
     ln -s $docs/Suite66.pdf "$xdg"/Suite66.pdf
-elif [[ -d /run/dinit ]]; then
+elif [ -d /run/dinit ]; then
     ln -s $docs/Dinit.pdf "$xdg"/Dinit.pdf
 else
     ln -s $docs/S6.pdf "$xdg"/S6.pdf

data/dinit/pacman-init

@@ -1,5 +1,5 @@
 type         = scripted
-command      = /etc/dinit.d/scripts/pacman-init
+command      = /usr/lib/dinit/pacman-init
 stop-command = /usr/bin/umount -l /etc/pacman.d/gnupg
 restart      = false
 waits-for    = setup

libalpm/scripts/liveservices-hook

@@ -11,38 +11,30 @@ s6_enable_live_services(){
     if [ -d /etc/s6/sv/sddm/dependencies.d ]; then
         touch /etc/s6/sv/sddm/dependencies.d/artix-live
     fi
-    # TODO: instead touch files under dependencies.d when s6-scripts updates
-    echo "artix-live" >> /etc/s6/sv/default/contents
-    echo "pacman-init" >> /etc/s6/sv/default/contents
 }
 
 s6_disable_live_services(){
-    # TODO: delete files under dependencies.d when s6-scripts updates
-    sed -i '/artix-live/d' /etc/s6/sv/default/contents
-    sed -i '/pacman-init/d' /etc/s6/sv/default/contents
     rm -f /etc/s6/sv/gdm/dependencies.d/artix-live
     rm -f /etc/s6/sv/lightdm-srv/dependencies.d/artix-live
     rm -f /etc/s6/sv/sddm/dependencies.d/artix-live
 }
 
 suite66_enable_live_services(){
-    66-tree -ncE default
+    [ -d /var/lib/66/system/boot ] || 66-tree -n boot
+    [ -d /var/lib/66/system/default ] || 66-tree -ncE default
     66-enable -t default artix-live pacman-init
 
     if [ -f /usr/bin/gdm ]; then
         66-disable -t default logind gdm
-        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\
+        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( \1artix-live pacman-init )#' /etc/66/service/gdm
-    '\1artix-live pacman-init )#' /etc/66/service/gdm
         66-enable -t default logind gdm
     elif [ -f /usr/bin/lightdm ]; then
         66-disable -t default logind lightdm
-        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\
+        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( \1artix-live pacman-init )#' /etc/66/service/lightdm
-    '\1artix-live pacman-init )#' /etc/66/service/lightdm
         66-enable -t default logind lightdm
     elif [ -f /usr/bin/sddm ]; then
         66-disable -t default logind sddm
-        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\
+        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( \1artix-live pacman-init )#' /etc/66/service/sddm
-    '\1artix-live pacman-init )#' /etc/66/service/sddm
         66-enable -t default logind sddm
     fi