From f852d5876b8c0be70e3686efd4f0a005dbb53648 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Mon, 19 Jul 2021 17:06:58 -0400
Subject: wip - multiple concerns

---
 src/chroot-tools/libremakepkg | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/chroot-tools/libremakepkg')

diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index 3718166..945b8ae 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -110,6 +110,8 @@ chroot_cleanup() {
 }
 
 build() (
+DBG "libremakepkg::build() IN"
+
   local copydir=$1
   local srcpkg=$2
   local repack=$3
@@ -134,11 +136,17 @@ build() (
   fi
   $NONET || run_nnet=("${run_ynet[@]}")
 
-  prepare_chroot "$copydir" "$LIBREHOME" "$repack" false
+DBG "libremakepkg::build() prepare_chroot"
+
+  prepare_chroot "$copydir" "$LIBREHOME" "$repack" false # generates 'chrootbuild'
+
+DBG "libremakepkg::build() pre_build run_nnet=${run_nnet[*]}"
 
   run_hook pre_build "$copydir"
   trap "run_hook post_build ${copydir@Q}; rm -rf -- ${startdir@Q}" EXIT
-  "${run_nnet[@]}" /chrootbuild "${makepkg_args[@]}" </dev/null |& indent
+  "${run_nnet[@]}" /chrootbuild "${makepkg_args[@]}" < /dev/null |& indent
+
+DBG "libremakepkg::build() OUT"
 )
 
 # The main program #############################################################
@@ -299,6 +307,7 @@ main() {
     msg 'Initializing the chroot...'
     librechroot "${librechroot_flags[@]}" make |& indent
   fi
+DBG "libremakepkg::main() GUARD whoami=$(whoami) id=$(id)" ; return 1
 
   # Set target CARCH
   # note that we waited until after locking/creating the chroot to do this
-- 
cgit v1.2.2