felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: small fixes on builders scripts.

Browse source
This commit is contained in:
Alexandre Pujol 2024-10-16 23:58:48 +01:00
parent 4797026e28
commit d406596124
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
4 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dists/docker.sh
View file

@ -12,7 +12,8 @@ readonly PREFIX="builder-"
readonly PKGNAME=apparmor.d
readonly VOLUME=/tmp/build
readonly BUILDIR=/home/build/tmp
readonly OUTPUT=".pkg"
readonly OUTDIR=".pkg"
readonly OUTPUT="$PWD/$OUTDIR"
readonly COMMAND="$1"
VERSION="0.$(git rev-list --count HEAD)"
PACKAGER="$(git config user.name) <$(git config user.email)>"
@ -63,7 +64,7 @@ build_in_docker_makepkg() {
fi
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh pkg
mv "$VOLUME/$PKGNAME"-*.pkg.* "$OUTPUT"
mv "$VOLUME/$PKGNAME/$OUTDIR/$PKGNAME"-*.pkg.* "$OUTPUT"
}
build_in_docker_dpkg() {
@ -86,7 +87,7 @@ build_in_docker_dpkg() {
fi
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh dpkg
mv "$VOLUME/$PKGNAME/${PKGNAME}_${VERSION}-1"_*.* "$OUTPUT"
mv "$VOLUME/$PKGNAME/$OUTDIR/${PKGNAME}_${VERSION}-1"_*.* "$OUTPUT"
}
build_in_docker_rpm() {
@ -105,7 +106,7 @@ build_in_docker_rpm() {
fi
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh rpm
mv "$VOLUME/$PKGNAME/$PKGNAME-$VERSION-"*.rpm "$OUTPUT"
mv "$VOLUME/$PKGNAME/$OUTDIR/$PKGNAME-$VERSION-"*.rpm "$OUTPUT"
}
main() {