adapt to new service scheme

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.13.5
+VERSION = 0.13.8
 
 PKG = live-services
 TOOLS = artools
@@ -149,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

@@ -13,9 +13,11 @@ src=@datadir@/applications
 # fi
 
 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

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