completely remove PKGDEST

bin/build-set.in

@@ -83,10 +83,6 @@ else
     repodir='/srv/build-repo'
 fi
 
-# if [[ -r /etc/makepkg.conf ]]; then
-#     source /etc/makepkg.conf
-# fi
-
 pacman_conf_arch='default'
 
 clean_first=false
@@ -155,7 +151,12 @@ makepkg_conf="@pkgdatadir@/makepkg-${arch}.conf"
 
 chrootdir=${chroots}/${branch}-${arch}
 
-set_pkgdir
+if [[ -n ${pkgdir} ]];then
+    pkgdir=${pkgdir}
+else
+    pkgdir='/var/cache/manjaro-tools/pkg'
+fi
+prepare_dir "${pkgdir}"
 
 if ${nosystemd};then
     mkchroot_args+=(-x)

conf/manjaro-tools.conf

@@ -10,7 +10,6 @@
 # branch=stable
 
 # pkgdir where to copy pkgs
-# If makepkg.conf has PGKDEST set, this path will be set to $PKGDEST
 # pkgdir=/var/cache/manjaro-tools/pkg
 
 # default set; name without .set suffix

lib/build-api.sh

@@ -34,17 +34,6 @@ repo_create(){
     msg "Done repo ${repodir}"
 }
 
-set_pkgdir(){
-    if [[ -n ${pkgdir} ]];then
-	pkgdir=${pkgdir}
-#     elif [[ -n $PKGDEST ]];then
-# 	pkgdir=$PKGDEST
-    else
-	pkgdir='/var/cache/manjaro-tools/pkg'
-	prepare_dir "${pkgdir}"
-    fi
-}
-
 sign_pkgs(){
     ch_owner "${pkgdir}"
     cd $pkgdir
@@ -151,12 +140,6 @@ chroot_build(){
 	    if [[ $pkg == 'eudev' ]]; then
 		local blacklist=('libsystemd') temp=
 		pacman -Rdd "${blacklist[@]}" -r ${chrootdir}/$(get_user) --noconfirm
-# 		if [[ -z $PKGDEST ]];then
-# 		    temp=$pkg
-# 		else
-# 		    temp=$pkgdir/$pkg
-# 		fi
-# 		pacman -U $temp*${arch}*pkg*z -r ${chrootdir}/$(get_user) --noconfirm
 		pacman -U *pkg*z -r ${chrootdir}/$(get_user) --noconfirm
 	    fi
 	    mv_pkg "${pkg}"
@@ -184,7 +167,6 @@ display_settings(){
     msg2 "chrootdir: ${chrootdir}"
     msg2 "profiledir: ${profiledir}"
     msg2 "pkgdir: ${pkgdir}"
-#     msg2 "PKGDEST: ${PKGDEST}"
     msg2 "repodir: ${repodir}"
     msg2 "pacman_conf: ${pacman_conf}"
     msg2 "makepkg_conf: ${makepkg_conf}"