fuck -e

This was originally copied over from the s6 oneshot script. The fdmove
line is not needed and serves no purpose. Just remove it.

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.13.8
+VERSION = 0.13.3
 
 PKG = live-services
 TOOLS = artools
@@ -40,10 +40,6 @@ 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
@@ -129,18 +125,14 @@ install_runit:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
 	install $(BMODE) $(RUNIT_SV) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init/run
 
-install_s6:
+install_s6: install_alpm
 	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 $(FMODE) $(S6_PI) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init/
+	install $(BMODE) $(S6_PI) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init/
 
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live
-	install $(FMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/
+	install $(BMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/
 
 install_66: install_alpm
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/66/service
@@ -153,7 +145,7 @@ install_dinit:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.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)$(LIBDIR)/dinit/pacman-init
+	install $(BMODE) $(DINIT_PI_SCRIPT) $(DESTDIR)$(SYSCONFDIR)/dinit.d/scripts/pacman-init
 	ln -s ../artix-live $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
 	ln -s ../pacman-init $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
 

README.md

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

bin/desktop-items.in

@@ -7,17 +7,15 @@ 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
-    installer='calamares.desktop'
-    cp -f $src/$installer "$xdg/"
-    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g "$xdg"/$installer
-    sed -r -i "s|XAUTHCOOKIE|$XAUTHORITY|" "$xdg"/$installer
-    chmod +x "$xdg/$installer"
+if [[ -f @bindir@/calamares ]]; then
+    cp -f $src/calamares.desktop "$xdg/"
+    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g "$xdg"/calamares.desktop
+    chmod +x "$xdg/calamares.desktop"
 fi
 
 docs=@datadir@/doc/artix
@@ -26,13 +24,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/artix-live

@@ -1,4 +1,4 @@
 type      = scripted
 command   = /usr/bin/artix-live
 restart   = false
-after     = setup
+waits-for = setup

data/dinit/pacman-init

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

libalpm/scripts/liveservices-hook

@@ -11,9 +11,15 @@ 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
@@ -26,15 +32,18 @@ suite66_enable_live_services(){
 
     if [ -f /usr/bin/gdm ]; then
         66-disable -t default logind gdm
-        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( \1artix-live pacman-init )#' /etc/66/service/gdm
+        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\
+    '\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 = ( \1artix-live pacman-init )#' /etc/66/service/lightdm
+        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\
+    '\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 = ( \1artix-live pacman-init )#' /etc/66/service/sddm
+        sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\
+    '\1artix-live pacman-init )#' /etc/66/service/sddm
         66-enable -t default logind sddm
     fi