live-bootstrap

commit: ef2deec60e7613cfb06c35972915ce7603379371
parent 364cacb1cee4275a9f886f48d1f50c17ce786b2e
Author: Andrius Štikonas <andrius@stikonas.eu>
Date:   Sun,  5 Mar 2023 20:27:12 +0000

Use .env file for passing environmental variables in sysa.

Diffstat:
M
sysa/run.sh
12
+++++++++++-
M
sysa/run2.sh
3
+++
M
sysc/init
18
+++++++++++-------
M
sysc/run.sh
2
+-

4 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/sysa/run.sh b/sysa/run.sh
@@ -195,4 +195,14 @@ build libtool-2.2.4
 
 build bash-5.2.15
 
-exec env -i PATH="${PATH}" PREFIX="${PREFIX}" LIBDIR="${LIBDIR}" SOURCES="${SOURCES}" DISTFILES="${DISTFILES}" DESTDIR="${DESTDIR}" SRCDIR="${SRCDIR}" bash run2.sh
+cat > .env <<- EOF
+export PATH=${PATH}
+PREFIX=${PREFIX}
+LIBDIR=${LIBDIR}
+SOURCES=${SOURCES}
+DESTDIR=${DESTDIR}
+DISTFILES=${DISTFILES}
+SRCDIR=${SRCDIR}
+EOF
+
+exec env -i bash run2.sh
diff --git a/sysa/run2.sh b/sysa/run2.sh
@@ -8,6 +8,9 @@
 
 set -e
 
+# shellcheck source=/dev/null
+. .env
+
 # shellcheck source=sysa/helpers.sh
 . helpers.sh
 
diff --git a/sysc/init b/sysc/init
@@ -66,12 +66,16 @@ ln -s /usr/bin/bash /usr/bin/sh
 # Begin sysc bootstrapping process
 cd "${SOURCES}"
 
-echo "PREFIX=${PREFIX}" > .env
-# shellcheck disable=SC2129
-echo "LIBDIR=${LIBDIR}" >> .env
-echo "SOURCES=${SOURCES}" >> .env
-echo "DESTDIR=${DESTDIR}" >> .env
-echo "DISTFILES=${DISTFILES}" >> .env
-echo "SRCDIR=${SRCDIR}" >> .env
+cat > .env <<- EOF
+export PATH="${PREFIX}/bin:${PREFIX}/sbin"
+export HOME=/tmp
+export SOURCE_DATE_EPOCH=0
+PREFIX=${PREFIX}
+LIBDIR=${LIBDIR}
+SOURCES=${SOURCES}
+DESTDIR=${DESTDIR}
+DISTFILES=${DISTFILES}
+SRCDIR=${SRCDIR}
+EOF
 
 exec ./run.sh
diff --git a/sysc/run.sh b/sysc/run.sh
@@ -183,5 +183,5 @@ fi
 echo "Bootstrapping completed."
 
 cd "/"
-exec env -i PATH="${PATH}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash "${SOURCES}/after.sh"
+exec env -i bash "${SOURCES}/after.sh"