dinit: update service definitions and install paths

fix sed backup suffix
tag 0.13.7
2023-09-26 08:55:41 +07:00 · 2023-09-26 08:55:41 +07:00 · 2023-09-26 08:55:41 +07:00 · 2023-09-26 08:55:41 +07:00 · 2023-09-26 08:55:41 +07:00 · 2023-09-26 08:55:41 +07:00
5 changed files with 12 additions and 8 deletions
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-VERSION = 0.13.5
+VERSION = 0.13.8

 PKG = live-services
 TOOLS = artools
@@ -153,7 +153,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)$(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 ../pacman-init $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d

--- a/README.md
+++ b/README.md
@@ -1 +1,3 @@
 # live-services
+
+Live ISO setup, branding, installer for DE ISOs etc.
--- a/bin/desktop-items.in
+++ b/bin/desktop-items.in
@@ -13,9 +13,11 @@ src=@datadir@/applications
 # fi

 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"
+    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"
 fi

 docs=@datadir@/doc/artix
--- a/data/dinit/artix-live
+++ b/data/dinit/artix-live
@@ -1,4 +1,4 @@
 type      = scripted
 command   = /usr/bin/artix-live
 restart   = false
-waits-for = setup
+after     = setup
--- a/data/dinit/pacman-init
+++ b/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
+after        = setup
Author	SHA1	Message	Date
Muhammad Herdiansyah	6659fb93a6	dinit: update service definitions and install paths	2023-09-26 08:55:41 +07:00
nous	2043194c7c	fix sed backup suffix	2023-09-26 08:55:41 +07:00
nous	a2884c4f7e	tag 0.13.7	2023-09-26 08:55:41 +07:00
nous	049e0594e6	bump ver	2023-09-26 08:55:41 +07:00
nous	6d378e3d23	autodetect .Xauthority file	2023-09-26 08:55:41 +07:00
artoo	960470dcb8	live-s6: drop alpm hook	2023-09-26 08:55:41 +07:00
Dudemanguy	17b8a4212b	0.13.5	2023-09-26 08:55:41 +07:00
nous	e8cb811768	simplify square brackets	2023-09-26 08:55:41 +07:00
Dudemanguy	a213f0d936	s6: update to the new s6-rc format s6-scripts finally updated to the new s6-rc format so the live-service needs to change its formating to match. The main advantage of this is that there is no need to sed in artix-live and pacman-init into the contents file during the alpm hook. Instead, the empty files can just be installed into the directory. It's much cleaner. As an aside, a couple of BMODE calls in the makefile were changed to FMODE since s6-rc doesn't need any of these files to be executable.	2023-09-26 08:55:41 +07:00
Dudemanguy	cbe5781ae2	0.13.4	2023-09-26 08:55:41 +07:00
strajder	bd445b4c1e	liveservices-hook: Merge broken sed arguments into single lines Signed-off-by: strajder <strajder@artixlinux.org>	2023-09-26 08:55:41 +07:00
nous	ffe119f159	fuck -e	2023-09-26 08:55:41 +07:00
nous	dafd6ab93c	makefile bump	2023-09-26 08:55:41 +07:00
nous	e29057d1f8	fix crash in DE	2023-09-26 08:55:41 +07:00
Dudemanguy	b0f5c7b937	0.13.1	2023-09-26 08:55:41 +07:00
Dudemanguy	72bda65869	66: remove pointless fdmove in pacman-init This was originally copied over from the s6 oneshot script. The fdmove line is not needed and serves no purpose. Just remove it.	2023-09-26 08:55:41 +07:00
Dudemanguy	e597c25936	makefile: add alpm hooks to install_s6/66	2023-09-26 08:55:41 +07:00
strajder	10507f41b4	liveservices-hook: Add 66-specific setup Signed-off-by: strajder <strajder@artixlinux.org>	2023-09-26 08:55:41 +07:00
Dudemanguy	b0a4a9ff88	add alpm-hook for live services Only s6 and suite66 actually need to use this.	2023-09-26 08:55:41 +07:00
nous	a37e93855a	0.13	2023-09-26 08:55:41 +07:00
nous	a764b9692b	0.12.3	2023-09-26 08:55:41 +07:00
Muhammad Herdiansyah	97c94cfb33	0.12.2	2023-09-26 08:55:41 +07:00
Muhammad Herdiansyah	1eee05d86f	0.12.1	2023-09-26 08:55:41 +07:00
artoo	c9dc6eb57e	rc: use a display-manager provide	2023-09-26 08:55:41 +07:00
nous	10a3c36b2f	Update 'bin/desktop-items.in'	2023-09-26 08:55:41 +07:00
dudemanguy	a7cbbfebd1	s6: minor cleanups The "live" bundle is pointless and superfluous. Remove it. Also, the pacman-init up oneshot had a useless fdmove line in it. Remove that as well.	2023-09-26 08:55:41 +07:00
nous	d3d3e0463e	complete list	2023-09-26 08:55:41 +07:00
nous	783caefae2	openrc: start before display manager	2023-09-26 08:55:41 +07:00
nous	d38062f905	0.12	2023-09-26 08:55:41 +07:00
nous	b3577634a2	add dinit	2023-09-26 08:55:41 +07:00
Muhammad Herdiansyah	335060af49	dinit: use live.d	2022-01-08 07:55:34 +07:00
Muhammad Herdiansyah	7295830437	artix-live: attempt #1 , fix autologin	2022-01-08 06:59:55 +07:00