live-bootstrap

commit: 9638a796e9242e7e632f013eb6f529a1df087750
parent 49a267655113a85197b8682f6d23225795970d6d
Author: Andrius Štikonas <andrius@stikonas.eu>
Date:   Fri, 14 Jul 2023 08:52:59 +0100

Merge pull request #309 from doraskayo/clean-run-env


Diffstat:
M
sysb/init
9
++++++---
M
sysc/init
8
++++----
M
sysc/run.sh
2
+-

3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/sysb/init b/sysb/init
@@ -37,7 +37,10 @@ install_tar util-linux-2.19.1 0
 # Begin sysb bootstrapping process
 cd "${SOURCES}"
 
-echo "PREFIX=${PREFIX}" > .env
-echo "SOURCES=${SOURCES}" >> .env
+cat > .env <<- EOF
+export PATH=${PATH}
+PREFIX=${PREFIX}
+SOURCES=${SOURCES}
+EOF
 
-exec ./run.sh
+exec env -i bash run.sh
diff --git a/sysc/init b/sysc/init
@@ -68,9 +68,9 @@ ln -s /usr/bin/bash /usr/bin/sh
 cd "${SOURCES}"
 
 cat > .env <<- EOF
-export PATH="${PREFIX}/bin:${PREFIX}/sbin"
-export HOME=/tmp
-export SOURCE_DATE_EPOCH=0
+export PATH=${PATH}
+export HOME=${HOME}
+export SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}
 PREFIX=${PREFIX}
 LIBDIR=${LIBDIR}
 SOURCES=${SOURCES}
@@ -81,4 +81,4 @@ MAKEJOBS=${MAKEJOBS}
 INTERNAL_CI=${INTERNAL_CI}
 EOF
 
-exec ./run.sh
+exec env -i bash run.sh
diff --git a/sysc/run.sh b/sysc/run.sh
@@ -62,4 +62,4 @@ fi
 
 build bash-5.2.15
 
-exec env -i PATH="${PATH}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash run2.sh
+exec env -i bash run2.sh