[testing] -> [extra] 'live-services-0.12.1-2' move

live-services/x86_64/extra/PKGBUILD

@@ -9,8 +9,8 @@ pkgname=('artix-live-base'
         'artix-live-s6'
         'artix-live-suite66'
         'artix-live-dinit')
-pkgver=0.12
-pkgrel=1
+pkgver=0.12.1
+pkgrel=2
 pkgdesc='Artix live session'
 arch=('any')
 url="https://gitea.artixlinux.org/artix/live-services"
@@ -20,7 +20,7 @@ makedepends=('git')
 #_commit=91b23a52650c592c2f2596e9a2fb350d8a5c4aa6 # 0.11.1
 #source=("git+$url.git#commit=$_commit")
 source=("${pkgbase}-${pkgver}.tar.gz::$url/archive/${pkgver}.tar.gz")
-sha256sums=('762275316ca8d469fbb9ec964dcbd201c54c506f03373b388cdeafc2d01f5cc1')
+sha256sums=('5f72ce046388cffb4c2d654d56c78fecbb7280b98b480783c14cc0d4a651681b')
 
 build() {
     cd ${pkgbase}

live-services/x86_64/extra/live-66.install

@@ -1,6 +1,7 @@
 # This will start "live" tree after boot
 # and also create default boot tree and
 # needed boot services
+
 post_install() {
     66-tree -n boot
     66-enable -t boot -F boot@system

live-services/x86_64/extra/live-s6.install

@@ -1,4 +1,20 @@
 post_install() {
+    gdm=$(pacman -Qi gdm-s6 2> /dev/null)
+    if [ "$?" = "0" ]; then
+        touch /etc/s6/sv/gdm/dependencies.d/artix-live
+    fi
+    lightdm=$(pacman -Qi lightdm-s6 2> /dev/null)
+    if [ "$?" = "0" ]; then
+        touch /etc/s6/sv/lightdm-srv/dependencies.d/artix-live
+    fi
+    sddm=$(pacman -Qi sddm-s6 2> /dev/null)
+    if [ "$?" = "0" ]; then
+        touch /etc/s6/sv/sddm/dependencies.d/artix-live
+    fi
     sh /usr/share/libalpm/scripts/s6-rc-db-update-hook
     s6-rc-bundle-update -c /etc/s6/rc/compiled add default pacman-init artix-live
 }
+
+post_remove() {
+    rm -f /etc/s6/sv/{gdm,lightdm-srv,sddm}/dependencies.d/artix-live
+}

live-services/x86_64/testing/PKGBUILD

@@ -1,85 +0,0 @@
-# Maintainer: artoo <artoo@artixlinux.org>
-# Contributor: nous <nous@artixlinux.org>
-# Contributor: dudemanguy <dudemanguy@artixlinux.org>
-
-pkgbase=live-services
-pkgname=('artix-live-base'
-        'artix-live-openrc'
-        'artix-live-runit'
-        'artix-live-s6'
-        'artix-live-suite66'
-        'artix-live-dinit')
-pkgver=0.12.1
-pkgrel=2
-pkgdesc='Artix live session'
-arch=('any')
-url="https://gitea.artixlinux.org/artix/live-services"
-license=('GPL')
-makedepends=('git')
-# Build a commit point
-#_commit=91b23a52650c592c2f2596e9a2fb350d8a5c4aa6 # 0.11.1
-#source=("git+$url.git#commit=$_commit")
-source=("${pkgbase}-${pkgver}.tar.gz::$url/archive/${pkgver}.tar.gz")
-sha256sums=('5f72ce046388cffb4c2d654d56c78fecbb7280b98b480783c14cc0d4a651681b')
-
-build() {
-    cd ${pkgbase}
-    make
-}
-
-package_artix-live-base() {
-    pkgdesc='Artix live base scripts'
-    depends=('artools-base')
-
-    cd ${pkgbase}
-    make DESTDIR=${pkgdir} install_base install_xdg
-}
-
-package_artix-live-openrc() {
-    pkgdesc='Artix live openrc init scripts'
-    depends=('openrc' 'artix-live-base')
-
-    cd ${pkgbase}
-    make DESTDIR=${pkgdir} install_rc
-
-    install -d "${pkgdir}"/etc/runlevels/default
-    ln -sf /etc/init.d/pacman-init "${pkgdir}"/etc/runlevels/default/pacman-init
-    ln -sf /etc/init.d/artix-live "${pkgdir}"/etc/runlevels/default/artix-live
-}
-
-package_artix-live-runit() {
-    pkgdesc='Artix live runit init scripts'
-    depends=('runit' 'artix-live-base')
-
-    cd ${pkgbase}
-    make DESTDIR=${pkgdir} install_runit
-
-    install -d "${pkgdir}"/etc/runit/runsvdir/default
-    ln -sf /etc/runit/sv/pacman-init "${pkgdir}"/etc/runit/runsvdir/default/pacman-init
-}
-
-package_artix-live-s6() {
-    pkgdesc='Artix live s6 init scripts'
-    depends=('s6-base' 'artix-live-base')
-    install=live-s6.install
-
-    cd ${pkgbase}
-    make DESTDIR=${pkgdir} install_s6
-}
-
-package_artix-live-suite66() {
-    pkgdesc='Artix live suite66 init scripts'
-    depends=('suite66-base' 'artix-live-base')
-    install=live-66.install
-
-    cd ${pkgbase}
-    make DESTDIR=${pkgdir} install_66
-}
-
-package_artix-live-dinit() {
-    pkgdesc='Artix live dinit init scripts'
-    depends=('dinit' 'artix-live-base')
-
-    cd ${pkgbase}
-    make DESTDIR=${pkgdir} install_dinit
-}

live-services/x86_64/testing/live-66.install

@@ -1,12 +0,0 @@
-# This will start "live" tree after boot
-# and also create default boot tree and
-# needed boot services
-
-post_install() {
-    66-tree -n boot
-    66-enable -t boot -F boot@system
-
-    66-tree -ncE live
-    66-enable -t live artix-live
-    66-enable -t live pacman-init
-}

live-services/x86_64/testing/live-s6.install

@@ -1,20 +0,0 @@
-post_install() {
-    gdm=$(pacman -Qi gdm-s6 2> /dev/null)
-    if [ "$?" = "0" ]; then
-        touch /etc/s6/sv/gdm/dependencies.d/artix-live
-    fi
-    lightdm=$(pacman -Qi lightdm-s6 2> /dev/null)
-    if [ "$?" = "0" ]; then
-        touch /etc/s6/sv/lightdm-srv/dependencies.d/artix-live
-    fi
-    sddm=$(pacman -Qi sddm-s6 2> /dev/null)
-    if [ "$?" = "0" ]; then
-        touch /etc/s6/sv/sddm/dependencies.d/artix-live
-    fi
-    sh /usr/share/libalpm/scripts/s6-rc-db-update-hook
-    s6-rc-bundle-update -c /etc/s6/rc/compiled add default pacman-init artix-live
-}
-
-post_remove() {
-    rm -f /etc/s6/sv/{gdm,lightdm-srv,sddm}/dependencies.d/artix-live
-}