Commit ceb84394 authored by Armin Luntzer's avatar Armin Luntzer Committed by Jason Chu
Browse files

makechrootpkg: Check if build was successful. Copy package to cwd and cleanup... 


makechrootpkg: Check if build was successful. Copy package to cwd and cleanup $chrootdir/rw/build on success, keep directory contents on failure.

Signed-off-by: default avatarJason Chu <jchu@xentac.net>
parent e71c9784

makechrootpkg

+12 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
FORCE="n"

RUN=""

MAKEPKG_ARGS="-Ss"

WORKDIR=$PWD



chrootdir="$CHROOT_SHELL"
@@ -114,12 +115,20 @@ fi 
#!/bin/bash

export LANG=$LOCALE

cd /build

sudo -u nobody makepkg $MAKEPKG_ARGS

sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED

EOF

) > "$uniondir/chrootbuild"

chmod +x "$uniondir/chrootbuild"



mkarchroot -r "/chrootbuild" "$uniondir"



# TODO move relevant files here

echo "build complete... check \$CHROOT_SHELL/build for build results"
 
if [ -e ${chrootdir}/rw/build/BUILD_FAILED ]; then

	echo "Build failed, check \$CHROOT_DIR/rw/build"

	rm ${chrootdir}/rw/build/BUILD_FAILED

        exit 1

else	

	source ${WORKDIR}/PKGBUILD

	mv ${chrootdir}/rw/build/${pkgname}-${pkgver}-*.pkg.tar.gz ${WORKDIR}

	rm -rf ${chrootdir}/rw/build/* 

	echo "Build complete"

fi