5 Commits

Author SHA1 Message Date
a28ed7f20d 0.13.4 2022-01-21 13:49:04 -06:00
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
2d8d60c0bc fuck -e 2022-01-21 21:13:49 +02:00
04363a50bb makefile bump 2022-01-21 16:04:31 +02:00
f1368b1aa7 fix crash in DE 2022-01-21 15:59:08 +02:00
2 changed files with 6 additions and 9 deletions

View File

@@ -1,4 +1,4 @@
VERSION = 0.13.1 VERSION = 0.13.4
PKG = live-services PKG = live-services
TOOLS = artools TOOLS = artools

View File

@@ -26,24 +26,21 @@ s6_disable_live_services(){
} }
suite66_enable_live_services(){ suite66_enable_live_services(){
66-tree -n boot [ -d /var/lib/66/system/boot ] || 66-tree -n boot
66-tree -ncE default [ -d /var/lib/66/system/default ] || 66-tree -ncE default
66-enable -t default artix-live pacman-init 66-enable -t default artix-live pacman-init
if [ -f /usr/bin/gdm ]; then if [ -f /usr/bin/gdm ]; then
66-disable -t default logind gdm 66-disable -t default logind gdm
sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\ sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( \1artix-live pacman-init )#' /etc/66/service/gdm
'\1artix-live pacman-init )#' /etc/66/service/gdm
66-enable -t default logind gdm 66-enable -t default logind gdm
elif [ -f /usr/bin/lightdm ]; then elif [ -f /usr/bin/lightdm ]; then
66-disable -t default logind lightdm 66-disable -t default logind lightdm
sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\ sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( \1artix-live pacman-init )#' /etc/66/service/lightdm
'\1artix-live pacman-init )#' /etc/66/service/lightdm
66-enable -t default logind lightdm 66-enable -t default logind lightdm
elif [ -f /usr/bin/sddm ]; then elif [ -f /usr/bin/sddm ]; then
66-disable -t default logind sddm 66-disable -t default logind sddm
sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( '\ sed -i -E 's#@depends\s*=\s*\(\s*([^)]+)\s*\)#@depends = ( \1artix-live pacman-init )#' /etc/66/service/sddm
'\1artix-live pacman-init )#' /etc/66/service/sddm
66-enable -t default logind sddm 66-enable -t default logind sddm
fi fi