root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[util-pkg] redo log file handling

Browse source
This commit is contained in:
udeved 2015-02-11 20:47:01 +01:00
parent ca24593b06
commit 19234b89e8
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/util-pkg.sh
View file

@ -47,7 +47,6 @@ chroot_update(){
clean_up(){
msg "Cleaning up ..."
find ${cache_dir_pkg} -type f -maxdepth 1 -name "*.*" -delete &> /dev/null
[[ -z $LOGDEST ]] && find $PWD -type f -maxdepth 1 -name '*.log' -delete &> /dev/null
[[ -z $SRCDEST ]] && find $PWD -type f -maxdepth 1 -name '*.?z?' -delete &> /dev/null
}
@ -87,15 +86,15 @@ move_pkg(){
archive_logs(){
local ext='log.tar.xz'
if [[ -z $LOGDEST ]];then
# source PKGBUILD
if [[ -n $pkgbase ]];then
for p in ${pkgname[@]};do
tar -cxf $p-$pkgver-$pkgrel*.${ext} *.log
tar -cJf $PWD/$p-$pkgver-$pkgrel-${CARCH}.${ext} *.log
done
else
tar -cxf $pkgname-$pkgver-$pkgrel*.${ext} *.log
tar -cJf $PWD/$pkgname-$pkgver-$pkgrel-${CARCH}.${ext} *.log
fi
fi
find $PWD -maxdepth 1 -name '*.log' -delete #&> /dev/null
}
chroot_build(){
@ -112,7 +111,7 @@ chroot_build(){
mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || break
source PKGBUILD
move_pkg
archive_logs
[[ -z $LOGDEST ]] && archive_logs
cd ..
done
msg3 "Finished building [${buildset_pkg}]"
@ -127,7 +126,7 @@ chroot_build(){
mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || abort
source PKGBUILD
move_pkg
archive_logs
[[ -z $LOGDEST ]] && archive_logs
cd ..
fi
}