From 5ea53b4c3ca5704fde2dd2ff1f9f375c0e600700 Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Tue, 25 Mar 2025 13:59:13 +0100
Subject: [PATCH] testing/moosefs: use amove

---
 testing/moosefs/APKBUILD | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/testing/moosefs/APKBUILD b/testing/moosefs/APKBUILD
index 96bf5105655..ddce9351c8e 100644
--- a/testing/moosefs/APKBUILD
+++ b/testing/moosefs/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Michael Pirogov <vbnet.ru@gmail.com>
 pkgname=moosefs
 pkgver=4.56.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System"
 url="https://moosefs.com"
 arch="all"
@@ -61,22 +61,10 @@ package() {
 	chown -R mfs:mfs "$pkgdir"/var/lib/mfs
 }
 
-_mv_files() {
-	local i
-	for i in "$@"; do
-		case $i in
-		*/*) mkdir -p "$subpkgdir"/${i%/*};;
-		*) mkdir -p "$subpkgdir";;
-		esac
-		mv "$pkgdir"/$i "$subpkgdir"/$i
-	done
-}
-
 master() {
 	pkgdesc="MooseFS master server"
 	depends="moosefs=$pkgver-r$pkgrel"
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/sbin/mfsmaster \
 		usr/sbin/mfsmetadump \
 		usr/sbin/mfsmetarestore \
@@ -84,35 +72,31 @@ master() {
 		etc/mfs/mfstopology.cfg.sample \
 		etc/mfs/mfsmaster.cfg.sample \
 		var/lib/mfs/metadata.mfs.empty
-		chown -R $pkgusers:$pkggroups "$subpkgdir"/var/lib/mfs
+	chown -R $pkgusers:$pkggroups "$subpkgdir"/var/lib/mfs
 }
 
 master_openrc() {
 	default_openrc
-	cd "$pkgdir"
 	install -Dm755 "$srcdir"/moosefs-master.initd "$subpkgdir"/etc/init.d/moosefs-master
 }
 
 metalogger() {
 	pkgdesc="MooseFS metadata replication server"
 	depends="moosefs=$pkgver-r$pkgrel"
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/sbin/mfsmetalogger \
 		etc/mfs/mfsmetalogger.cfg.sample
 }
 
 metalogger_openrc() {
 	default_openrc
-	cd "$pkgdir"
 	install -Dm755 "$srcdir"/moosefs-metalogger.initd "$subpkgdir"/etc/init.d/moosefs-metalogger
 }
 
 chunkserver() {
 	pkgdesc="MooseFS data server"
 	depends="moosefs=$pkgver-r$pkgrel"
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/sbin/mfschunkserver \
 		etc/mfs/mfschunkserver.cfg.sample \
 		etc/mfs/mfshdd.cfg.sample
@@ -126,8 +110,7 @@ chunkserver_openrc() {
 client() {
 	pkgdesc="MooseFS client"
 	depends="fuse3"
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/bin \
 		sbin/mount.* \
 		etc/mfs/mfsmount.cfg.sample
@@ -138,15 +121,13 @@ client() {
 cgi() {
 	pkgdesc="MooseFS CGI Monitor"
 	depends="python3"
-	cd "$pkgdir"
-	_mv_files usr/share/mfscgi
+	amove usr/share/mfscgi
 }
 
 cgiserv() {
 	pkgdesc="Simple CGI-capable HTTP server to run MooseFS CGI Monitor"
 	depends="$pkgname-cgi=$pkgver-r$pkgrel"
-	cd "$pkgdir"
-	_mv_files usr/sbin/mfscgiserv
+	amove usr/sbin/mfscgiserv
 }
 
 cgiserv_openrc() {