fix runit live sym

Makefile

@@ -33,8 +33,8 @@ RC = \
 	data/rc/pacman-init \
 	data/rc/artix-live
 
-RUNIT_CORE = \
+RUNIT_SVD = \
-	data/runit/89-artix-live.sh
+	data/runit/live
 
 RUNIT_SV = \
 	data/runit/pacman-init.run
@@ -47,7 +47,7 @@ GRUB_D = \
 
 all: $(BIN) $(RC) $(RUNIT_SV) $(XBIN) $(GRUB_D)
 
-EDIT = sed -e "s|@datadir[@]|$(DATADIR)$(TOOLS)|g" \
+EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
 	-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
 	-e "s|@libdir[@]|$(LIBDIR)/$(TOOLS)|g"
 
@@ -68,17 +68,21 @@ install_base:
 	install $(DMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 	install $(FMODE) $(LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 
-	install $(DMODE) $(DESTDIR)$(DATADIR)$(TOOLS)
+	install $(DMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
-	install $(FMODE) $(SHARED) $(DESTDIR)$(DATADIR)$(TOOLS)
+	install $(FMODE) $(SHARED) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install_rc:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/init.d
 	install $(BMODE) $(RC) $(DESTDIR)$(SYSCONFDIR)/init.d
 
 install_runit:
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/core-services
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/rc/sysinit
+	install $(DMODE) $(DESTDIR)$(LIBDIR)/rc/sv.d
+
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
-	install $(BMODE) $(RUNIT_CORE) $(DESTDIR)$(SYSCONFDIR)/runit/core-services
+	install $(BMODE) $(RUNIT_SVD) $(DESTDIR)$(LIBDIR)/rc/sv.d
+	ln -sf $(LIBDIR)/rc/sv.d/live $(DESTDIR)$(SYSCONFDIR)/rc/sysinit/98-live
+
 	install $(BMODE) $(RUNIT_SV) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init/run
 
 install_portable_efi:
@@ -89,8 +93,8 @@ install_portable_efi:
 	install $(BMODE) $(GRUB_D) $(DESTDIR)$(SYSCONFDIR)/grub.d
 
 uninstall_base:
-	for f in $(notdir $(BIN)); do $(RM) $(DESTDIR)$(PREFIX)/bin/$$f; done
+	for f in $(notdir $(BIN)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
-	for f in $(notdir $(SHARED)); do $(RM) $(DESTDIR)$(DATADIR)$(TOOLS)/$$f; done
+	for f in $(notdir $(SHARED)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
 	for f in $(notdir $(LIBS)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
 
 uninstall_portable_efi:

data/runit/89-artix-live.sh

@@ -1,2 +0,0 @@
-msg "Initializing artix-live script"
-artix-live

data/runit/live

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+. /usr/lib/rc/functions
+
+case "$1" in
+    start)
+        stat_busy "Initializing artix live system"
+        artix-live #|| stat_die
+        add_daemon live
+        stat_done
+        ;;
+    *)
+        echo "usage: $0 {start}"
+        ;;
+esac