bump ver

autodetect .Xauthority file
live-s6: drop alpm hook
2023-07-09 00:24:22 +03:00 · 2023-07-09 00:21:18 +03:00 · 2022-04-10 02:03:41 +02:00 · 2022-03-11 10:02:33 -06:00 · 2022-02-13 01:33:14 +02:00 · 2022-01-27 12:48:03 +01:00
5 changed files with 23 additions and 19 deletions
--- a/16
+++ b/16
@@ -1,4 +1,4 @@
-VERSION = 0.13.4
+VERSION = 0.13.7

 PKG = live-services
 TOOLS = artools
@@ -40,6 +40,10 @@ 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
@@ -125,14 +129,18 @@ install_runit:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
 	install $(BMODE) $(RUNIT_SV) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init/run

-install_s6: install_alpm
+install_s6:
 	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 $(BMODE) $(S6_PI) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init/
+	install $(FMODE) $(S6_PI) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init/

 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live
-	install $(BMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/
+	install $(FMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/

 install_66: install_alpm
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/66/service
--- a/bin/desktop-items.in
+++ b/bin/desktop-items.in
@@ -7,15 +7,17 @@ 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
-    cp -f $src/calamares.desktop "$xdg/"
-    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g "$xdg"/calamares.desktop
-    chmod +x "$xdg/calamares.desktop"
+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 -ir "s|XAUTHCOOKIE|$XAUTHORITY|" "$xdg"/$installer
+    chmod +x "$xdg/$installer"
 fi

 docs=@datadir@/doc/artix
@@ -24,13 +26,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
--- a/data/s6/default/contents.d/artix-live
+++ b/data/s6/default/contents.d/artix-live
--- a/data/s6/default/contents.d/pacman-init
+++ b/data/s6/default/contents.d/pacman-init
--- a/libalpm/scripts/liveservices-hook
+++ b/libalpm/scripts/liveservices-hook
@@ -11,15 +11,9 @@ 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
Author	SHA1	Message	Date
nous	4c3cb26d8e	bump ver	2023-07-09 00:24:22 +03:00
nous	0736ea40b4	autodetect .Xauthority file	2023-07-09 00:21:18 +03:00
artoo	9fb0b98c6a	live-s6: drop alpm hook	2022-04-10 02:03:41 +02:00
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