0.13.5

simplify square brackets
Merge pull request 's6: update to the new s6-rc format' (#12 ) from s6-new-format into master
2022-03-11 10:02:33 -06:00 · 2022-02-13 01:33:14 +02:00 · 2022-01-27 12:48:03 +01:00 · 2022-01-23 13:17:33 -06:00 · 2022-01-21 13:49:04 -06:00 · 2022-01-21 20:40:59 +01:00
5 changed files with 9 additions and 13 deletions
--- a/6
+++ b/6
@@ -1,4 +1,4 @@
-VERSION = 0.13.8
+VERSION = 0.13.5
 PKG = live-services
 TOOLS = artools
@@ -129,7 +129,7 @@ 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
@@ -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)$(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
--- a/README.md
+++ b/README.md
@@ -1,3 +1 @@
 # live-services
 Live ISO setup, branding, installer for DE ISOs etc.
--- a/bin/desktop-items.in
+++ b/bin/desktop-items.in
@@ -13,11 +13,9 @@ src=@datadir@/applications
 # fi
 if [ -f @bindir@/calamares ]; then
-    installer='calamares.desktop'
+    cp -f $src/calamares.desktop "$xdg/"
-    cp -f $src/$installer "$xdg/"
+    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g "$xdg"/calamares.desktop
-    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g "$xdg"/$installer
+    chmod +x "$xdg/calamares.desktop"
    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
-after     = setup
+waits-for = setup
--- a/data/dinit/pacman-init
+++ b/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
Author	SHA1	Message	Date
Dudemanguy	a606b09367	0.13.5	2022-03-11 10:02:33 -06:00
nous	a94e642103	simplify square brackets	2022-02-13 01:33:14 +02:00
artoo	1c6a1e592c	Merge pull request 's6: update to the new s6-rc format' (#12 ) from s6-new-format into master Reviewed-on: artix/live-services#12	2022-01-27 12:48:03 +01:00
Dudemanguy	f29508d011	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.	2022-01-23 13:17:33 -06:00
Dudemanguy	a28ed7f20d	0.13.4	2022-01-21 13:49:04 -06:00
strajder	4739509ac7	liveservices-hook: Merge broken sed arguments into single lines Signed-off-by: strajder <strajder@artixlinux.org>	2022-01-21 20:40:59 +01:00
nous	2d8d60c0bc	fuck -e	2022-01-21 21:13:49 +02:00
nous	04363a50bb	makefile bump	2022-01-21 16:04:31 +02:00
nous	f1368b1aa7	fix crash in DE	2022-01-21 15:59:08 +02:00
Dudemanguy	51ef407331	0.13.1	2022-01-20 19:24:07 -06:00
Dudemanguy	33d9fd2da3	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.	2022-01-20 19:20:45 -06:00
Dudemanguy	56f1455c77	makefile: add alpm hooks to install_s6/66	2022-01-20 19:20:45 -06:00
strajder	5b35f20375	liveservices-hook: Add 66-specific setup Signed-off-by: strajder <strajder@artixlinux.org>	2022-01-20 19:20:45 -06:00
Dudemanguy	730908dc51	add alpm-hook for live services Only s6 and suite66 actually need to use this.	2022-01-20 19:20:45 -06:00
nous	9672ce5b46	0.13	2022-01-21 00:50:37 +02:00
nous	9cf651405e	0.12.3	2022-01-20 19:55:32 +02:00
Muhammad Herdiansyah	65c79b931c	0.12.2	2022-01-08 08:25:34 +07:00
Muhammad Herdiansyah	19fae52dc0	0.12.1	2022-01-08 08:20:23 +07:00
Muhammad Herdiansyah	1f62798998	dinit: use live.d for live services	2022-01-08 08:19:29 +07:00
artoo	231acc723b	rc: use a display-manager provide	2022-01-04 18:04:25 +01:00
nous	dafee38770	Update 'bin/desktop-items.in'	2021-12-31 20:59:30 +01:00
dudemanguy	91f8c5d64a	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.	2021-12-30 18:02:30 -06:00
nous	0bff2c5715	complete list	2021-12-31 00:14:12 +02:00
nous	88ebe2ee63	openrc: start before display manager	2021-12-30 23:12:40 +02:00
nous	d253e889c5	0.12	2021-12-22 02:32:57 +02:00
nous	71cb6715a5	add dinit	2021-12-22 02:21:01 +02:00
`@@ -1,3 +1 @@`
	`# live-services`	`# live-services`

	`Live ISO setup, branding, installer for DE ISOs etc.`