diff --git a/sysa/run.sh b/sysa/run.sh index 10ff0be..8e3c1a1 100755 --- 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 index 1653a26..bcf079a 100755 --- 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 index a8f94cd..86f550d 100755 --- 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 index dab41f3..ca5bda9 100755 --- 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"