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

[util-pkg] ad workaround arch var

Browse source
This commit is contained in:
udeved 2015-05-07 23:10:13 +02:00 committed by Ramon Buldó
parent 81cf7e27f8
commit da3a3618b8
1 changed files with 3 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/util-pkg.sh
View file

@ -74,14 +74,13 @@ sign_pkg(){
}
run_post_build(){
local _arch=${arch}
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}
pinfo=${pkgver}-${pkgrel}-${_arch}
fi
if [[ -n $PKGDEST ]];then
if [[ -n ${pkgbase} ]];then
@ -108,35 +107,9 @@ run_post_build(){
tar -cjf ${lname}-${pinfo}.log.tar.xz ${loglist[@]}
find $PWD -maxdepth 1 -name '*.log' -delete #&> /dev/null
fi
arch=$_arch
}
# move_pkg(){
# local ext='pkg.tar.xz'
# if [[ -n $PKGDEST ]];then
# if [[ -n $pkgbase ]];then
# for p in ${pkgname[@]};do
# mv $PKGDEST/$p*.${ext} ${cache_dir_pkg}/
# done
# else
# 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(){
msg "Start building [$1]"
cd $1
@ -178,10 +151,3 @@ chroot_init(){
fi
msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer}) minutes"
}
# sign_pkgs(){
# cd ${cache_dir_pkg}
# su "${OWNER}" <<'EOF'
# signpkgs
# EOF
# }