From 5c542377a8f06d9c201d4ade3260dec0b6183630 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 23 Sep 2022 12:31:56 +0200
Subject: [PATCH] abuild: fix amove corner cases

fix `amove dir` (without leading or trailing /)

add various testcases for amove
---
 abuild.in         |  8 +++--
 tests/abuild_test | 79 ++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/abuild.in b/abuild.in
index d013ab1..ac17067 100755
--- a/abuild.in
+++ b/abuild.in
@@ -79,11 +79,15 @@ amove() {
 	local pattern f
 	for pattern; do
 		for f in ${pattern#/}; do # let shell expand the pattern
-			# only create dir if needed
+			# strip trailing /
+			f=${f%/}
 			if [ "${f%/*}" != "$f" ]; then
 				mkdir -p "$subpkgdir/${f%/*}"
+				mv -v "$pkgdir"/$f "$subpkgdir/${f%/*}"
+			else
+				mkdir -p "$subpkgdir"
+				mv -v "$pkgdir"/$f "$subpkgdir/"
 			fi
-			mv -v "$pkgdir"/$f "$subpkgdir/${f%/*}"
 			# cleanup
 			rmdir -p "$f" 2>/dev/null || rmdir -p "${f%/*}" 2>/dev/null || true
 		done
diff --git a/tests/abuild_test b/tests/abuild_test
index f127abf..7fefae4 100755
--- a/tests/abuild_test
+++ b/tests/abuild_test
@@ -24,7 +24,8 @@ init_tests \
 	abuild_multiline_license \
 	abuild_git_ceiling \
 	abuild_package_size_zero \
-	abuild_package_size_nonzero
+	abuild_package_size_nonzero \
+	abuild_amove
 
 export ABUILD_SHAREDIR=$(atf_get_srcdir)/..
 export ABUILD_CONF=/dev/null
@@ -517,3 +518,79 @@ abuild_package_size_nonzero_body() {
 	atf_check -o not-match:'^size = 1$' \
 		cat pkg/.control.test-size/.PKGINFO
 }
+
+abuild_amove_body() {
+	init_keys
+	mkdir -p test-amove
+
+	cd test-amove
+	cat > APKBUILD <<-EOF
+		# Maintainer: Test User 123 <123@example.com>
+
+		# test package
+		pkgname="test-amove"
+		pkgver="1.0"
+		pkgrel=0
+		pkgdesc='Dummy test package - amove'
+		url='https://gitlab.alpinelinux.org/alpine/aports'
+		arch='noarch'
+		license='MIT'
+		subpackages="\$pkgname-file:_file
+			\$pkgname-etc:_etc
+			\$pkgname-bin:_bin
+			\$pkgname-sbin:_sbin
+			\$pkgname-var:_var
+			\$pkgname-usr:_usr"
+
+		package() {
+			mkdir -p "\$pkgdir"/etc \
+				"\$pkgdir"/bin \
+				"\$pkgdir"/sbin \
+				"\$pkgdir"/var/lib/\$pkgname \
+				"\$pkgdir"/usr/share
+			touch "\$pkgdir"/etc/file \
+				"\$pkgdir"/etc/\$pkgname.conf \
+				"\$pkgdir"/bin/hello \
+				"\$pkgdir"/sbin/shello \
+				"\$pkgdir"/var/lib/\$pkgname/testfile \
+				"\$pkgdir"/usr/share/a \
+				"\$pkgdir"/usr/share/b
+		}
+		_file() {
+			amove etc/file
+		}
+		_etc() {
+			# leading and trailing /
+			amove /etc/
+		}
+		_bin() {
+			# trailing /
+			amove bin/
+		}
+		_sbin() {
+			# no /
+			amove sbin/shello
+		}
+		_var() {
+			# leading /
+			amove /var/lib
+		}
+		_usr() {
+			# glob *
+			amove usr/share/*
+		}
+
+	EOF
+	abuild rootpkg || atf_fail "abuild rootpkg failed"
+	for i in \
+			test-amove-file/etc/file \
+			test-amove-etc/etc/test-amove.conf \
+			test-amove-bin/bin/hello \
+			test-amove-sbin/sbin/shello \
+			test-amove-var/var/lib/test-amove/testfile \
+			test-amove-usr/usr/share/a \
+			test-amove-usr/usr/share/b \
+			; do \
+		test -f pkg/$i || atf_fail "$i failed"
+	done
+}