From 5cc73dc1dd3aa9fea117690a9099e8667b5da545 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Sun, 16 Apr 2023 16:31:07 +0000 Subject: [PATCH] Refactor structure --- main/nnd-s6-linux-init/APKBUILD | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/main/nnd-s6-linux-init/APKBUILD b/main/nnd-s6-linux-init/APKBUILD index caf7cc8..c6a77c8 100644 --- a/main/nnd-s6-linux-init/APKBUILD +++ b/main/nnd-s6-linux-init/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=nnd-s6-linux-init -pkgver=1.3 -pkgrel=0 +pkgver=1.5 +pkgrel=4 pkgdesc="Skeleton for nnd-s6-services and symlinks" url="none" arch="noarch" @@ -17,29 +17,26 @@ options="!check" prepare() { default_prepare - cp -R "$startdir"/skel "$builddir"/skel + cp -R "$startdir"/skel "$builddir"/nnd-skel +} + +build() { + s6-linux-init-maker -1 -f "nnd-skel" "current" } package() { mkdir -p "$pkgdir"/etc/s6-linux-init - mv "$builddir"/skel "$pkgdir"/etc/s6-linux-init/nnd-skel + for x in nnd-skel current; do + mv "$builddir"/"$x" "$pkgdir"/etc/s6-linux-init/"$x" + done } _default() { - # TODO: How do we distribute the default in apkv3? - local base="/etc/s6-linux-init" depends="$depends nnd-s6-linux-init" - local \ - skel="$pkgdir/$base/nnd-skel" \ - dest="$subpkgdir/$base/current" + local base="/etc/s6-linux-init" + amove "$base/current" - mkdir -p "${dest%/*}" - s6-linux-init-maker -1 -f "$skel" "$dest" - - mkdir -p "$subpkgdir/sbin" - for i in "$dest"/bin/*; do - local bin="${i##*/}" - ln -sf "$base/current/bin/$bin" "$subpkgdir/sbin/$bin" - done + mkdir -p "$subpkgdir" + mv -v "$subpkgdir/$base/current/bin" "$subpkgdir/sbin" }