RepoMirrors/abuild
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git synced 2025-01-02 20:42:43 +00:00
Code Issues Projects Releases Wiki Activity

abuild: amove: allow spaces in pattern

Browse Source
This commit is contained in:
Sertonix 2023-12-12 21:38:22 +00:00 committed by Natanael Copa
parent 08d2d81587
commit 73cc75b3e0
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
abuild.in
View File

@ -78,17 +78,17 @@ amove() {
d="$(pwd -L)"
cd "$pkgdir"
local pattern f
local pattern f IFS=""
for pattern; do
for f in ${pattern#/}; do # let shell expand the pattern
# strip trailing /
f=${f%/}
if [ "${f%/*}" != "$f" ]; then
mkdir -p "$subpkgdir/${f%/*}"
mv -v "$pkgdir"/$f "$subpkgdir/${f%/*}"
mv -v "$pkgdir/$f" "$subpkgdir/${f%/*}"
else
mkdir -p "$subpkgdir"
mv -v "$pkgdir"/$f "$subpkgdir/"
mv -v "$pkgdir/$f" "$subpkgdir/"
fi
# cleanup
rmdir -p "$f" 2>/dev/null || rmdir -p "${f%/*}" 2>/dev/null || true

11
tests/abuild_test
View File

@ -667,7 +667,8 @@ abuild_amove_body() {
\$pkgname-bin:_bin
\$pkgname-sbin:_sbin
\$pkgname-var:_var
\$pkgname-usr:_usr"
\$pkgname-usr:_usr
\$pkgname-space:_space"
package() {
mkdir -p "\$pkgdir"/etc \
@ -679,6 +680,7 @@ abuild_amove_body() {
"\$pkgdir"/etc/\$pkgname.conf \
"\$pkgdir"/bin/hello \
"\$pkgdir"/sbin/shello \
"\$pkgdir"/sbin/space' ' \
"\$pkgdir"/var/lib/\$pkgname/testfile \
"\$pkgdir"/usr/share/a \
"\$pkgdir"/usr/share/b
@ -706,6 +708,10 @@ abuild_amove_body() {
# glob *
amove usr/share/*
}
_space() {
# with space
amove sbin/space' '
}
EOF
abuild rootpkg || atf_fail "abuild rootpkg failed"
@ -717,8 +723,9 @@ abuild_amove_body() {
test-amove-var/var/lib/test-amove/testfile \
test-amove-usr/usr/share/a \
test-amove-usr/usr/share/b \
test-amove-space/sbin/space' ' \
; do \
test -f pkg/$i || atf_fail "$i failed"
test -f pkg/"$i" || atf_fail "$i failed"
done
}