Refactor structure

main/nnd-s6-linux-init/APKBUILD

@@ -1,8 +1,8 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=nnd-s6-linux-init
-pkgver=1.3
+pkgver=1.5
-pkgrel=0
+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 \
+	local base="/etc/s6-linux-init"
-		skel="$pkgdir/$base/nnd-skel" \
+	amove "$base/current"
-		dest="$subpkgdir/$base/current"
 
-	mkdir -p "${dest%/*}"
+	mkdir -p "$subpkgdir"
-	s6-linux-init-maker -1 -f "$skel" "$dest"
+	mv -v "$subpkgdir/$base/current/bin" "$subpkgdir/sbin"
-
-	mkdir -p "$subpkgdir/sbin"
-	for i in "$dest"/bin/*; do
-		local bin="${i##*/}"
-		ln -sf "$base/current/bin/$bin" "$subpkgdir/sbin/$bin"
-	done
 }