root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-pkg] test run_post_build()

Browse source
This commit is contained in:
udeved 2015-05-07 22:41:56 +02:00
parent f4b9a63af6
commit b7b78609b1
1 changed files with 66 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
lib/util-pkg.sh
View file

@ -69,32 +69,73 @@ prepare_cachedir(){
chown -R "${OWNER}:users" "${cache_dir_pkg}" chown -R "${OWNER}:users" "${cache_dir_pkg}"
} }
move_pkg(){ sign_pkg(){
local ext='pkg.tar.xz' su ${OWNER} -c "signpkg ${cache_dir_pkg}/$1"
}
run_post_build(){
source PKGBUILD
# we need a different varnane for arch to make it to work
# with sourced PKGBUILD $arch -> see globalvars branch
local ext='pkg.tar.xz' pinfo loglist=() lname
if [[ ${arch} == "any" ]]; then
pinfo=${pkgver}-${pkgrel}-any
else
pinfo=${pkgver}-${pkgrel}-${arch}
fi
if [[ -n $PKGDEST ]];then if [[ -n $PKGDEST ]];then
if [[ -n $pkgbase ]];then if [[ -n ${pkgbase} ]];then
for p in ${pkgname[@]};do for p in ${pkgname[@]};do
mv $PKGDEST/$p*.${ext} ${cache_dir_pkg}/ mv $PKGDEST/${p}-${pinfo}.${ext} ${cache_dir_pkg}/
${sign} && sign_pkg ${p}-${pinfo}.${ext}
loglist+=("*$p*.log")
lname=${pkgbase}
done done
else else
mv $PKGDEST/$pkgname*.${ext} ${cache_dir_pkg}/ mv $PKGDEST/${pkgname}-${pinfo}.${ext} ${cache_dir_pkg}/
${sign} && sign_pkg ${pkgname}-${pinfo}.${ext}
loglist+=("*${pkgname}*.log")
lname=${pkgname}
fi fi
else else
mv *.${ext} ${cache_dir_pkg} mv *.${ext} ${cache_dir_pkg}
${sign} && sign_pkg ${pkgname}-${pinfo}.${ext}
loglist+=("*${pkgname}*.log")
lname=${pkgname}
fi fi
chown -R "${OWNER}:users" "${cache_dir_pkg}" chown -R "${OWNER}:users" "${cache_dir_pkg}"
if [[ -z $LOGDEST ]];then
tar -cjf ${lname}-${pinfo}.log.tar.xz ${loglist[@]}
find $PWD -maxdepth 1 -name '*.log' -delete #&> /dev/null
fi
} }
archive_logs(){ # move_pkg(){
local ext='log.tar.xz' logfile # local ext='pkg.tar.xz'
if [[ -n $pkgbase ]];then # if [[ -n $PKGDEST ]];then
logfile=$PWD/$pkgbase-$pkgver-$pkgrel.${ext} # if [[ -n $pkgbase ]];then
else # for p in ${pkgname[@]};do
logfile=$PWD/$pkgname-$pkgver-$pkgrel.${ext} # mv $PKGDEST/$p*.${ext} ${cache_dir_pkg}/
fi # done
tar -cJf ${logfile} $pkgname-$pkgver-$pkgrel*.log # else
find $PWD -maxdepth 1 -name '*.log' -delete #&> /dev/null # mv $PKGDEST/$pkgname*.${ext} ${cache_dir_pkg}/
} # fi
# else
# mv *.${ext} ${cache_dir_pkg}
# fi
# chown -R "${OWNER}:users" "${cache_dir_pkg}"
# }
#
# archive_logs(){
# local ext='log.tar.xz' logfile
# if [[ -n $pkgbase ]];then
# logfile=$PWD/$pkgbase-$pkgver-$pkgrel.${ext}
# else
# logfile=$PWD/$pkgname-$pkgver-$pkgrel.${ext}
# fi
# tar -cJf ${logfile} $pkgname-$pkgver-$pkgrel*.log
# find $PWD -maxdepth 1 -name '*.log' -delete #&> /dev/null
# }
make_pkg(){ make_pkg(){
msg "Start building [$1]" msg "Start building [$1]"
@ -104,9 +145,10 @@ make_pkg(){
done done
setarch "${arch}" \ setarch "${arch}" \
mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || eval "$2" mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || eval "$2"
source PKGBUILD run_post_build
move_pkg #source PKGBUILD
[[ -z $LOGDEST ]] && archive_logs #move_pkg
#[[ -z $LOGDEST ]] && archive_logs
cd .. cd ..
msg "Finished building [$1]" msg "Finished building [$1]"
msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes" msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes"
@ -137,9 +179,9 @@ chroot_init(){
msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer}) minutes" msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer}) minutes"
} }
sign_pkgs(){ # sign_pkgs(){
cd ${cache_dir_pkg} # cd ${cache_dir_pkg}
su "${OWNER}" <<'EOF' # su "${OWNER}" <<'EOF'
signpkgs # signpkgs
EOF # EOF
} # }