From 4ff79cfdd61a99b8a407122422c0fcc3deb5a1af Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Fri, 2 Jan 2026 01:30:13 -0500 Subject: [PATCH] update: seperate HOME and TEMPDIR now setup LEAFHOME and LEAFTEMPDIR to /tmp/leaf-tmp/$PKG_NAME and export HOME=$LEAFHOME TEMPDIR=$LEAFTEMPDIR in this way, HOME and TEMPDIR is out of source tree, which is better also, path is shorter --- leaf | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/leaf b/leaf index b1e987d..f61931f 100755 --- a/leaf +++ b/leaf @@ -68,15 +68,17 @@ main() { fi leaf_parse_options srcdir="${BUILD_DIR}/${PKG_PREFIX}/${PKG_NAME}" - TMPDIR="${srcdir}/.leaf-tmp" - HOME="${srcdir}/.leaf-home" - export TMPDIR - export HOME + LEAFTMPDIR="/tmp/leaf-tmp/${PKG_NAME}" + LEAFHOME="/tmp/leaf-tmp/${PKG_NAME}" + export TMPDIR="${LEAFTMPDIR}" + export HOME=${LEAFHOME} pkgdir="${srcdir}"/__pkgdir__ if [[ x"$1" != x"dirct-install" ]]; then rm -rf "${srcdir}" && install -dm755 "${srcdir}" && cd "${srcdir}" fi leaf_${1}_package + #rm -rf "${LEAFTMPDIR}" + #rm -rf "${LEAFHOME}" done ;; upgrade) @@ -650,6 +652,7 @@ leaf_prepare_package() { } leaf_build_package() { + rm -rf -- ${TMPDIR} ${HOME} mkdir -pv ${TMPDIR} mkdir -pv ${HOME} @@ -773,13 +776,14 @@ leaf_upgrade_package() { leaf_parse_options srcdir="${BUILD_DIR}/${PKG_PREFIX}/${PKG_NAME}" - TMPDIR="${srcdir}/.leaf-tmp" - HOME="${srcdir}/.leaf-home" - export TMPDIR HOME + LEAFTMPDIR="/tmp/leaf-tmp/${PKG_NAME}" + LEAFHOME="${LEAFTMPDIR}" + export TMPDIR="${LEAFTMPDIR}" + export HOME="${LEAFHOME}" pkgdir="${srcdir}/__pkgdir__" rm -rf -- "${srcdir}" && install -dm755 -- "${srcdir}" && cd "${srcdir}" - mkdir -pv -- "${TMPDIR}" "${HOME}" + mkdir -pv -- "${LEAFTMPDIR}" "${LEAFHOME}" leaf_build_package @@ -800,15 +804,18 @@ leaf_upgrade_package() { srcdir="${new_srcdir}" pkgdir="${new_pkgdir}" - TMPDIR="${srcdir}/.leaf-tmp" - HOME="${srcdir}/.leaf-home" - export TMPDIR HOME + LEAFTMPDIR="/tmp/leaf-tmp/${PKG_NAME}" + LEAFHOME="${LEAFTMPDIR}" + export TMPDIR="${LEAFTMPDIR}" + export HOME="${LEAFHOME}" [ -d "${pkgdir}" ] || leaf_error "upgrade: built pkgdir missing: ${pkgdir}" cd "${srcdir}" || leaf_error "upgrade: cannot enter build dir: ${srcdir}" leaf_dirct-install_package + #rm -rf -- "${LEAFTMPDIR}" "${LEAFHOME}" + # new trace dir now exists (generated by leaf_dirct-install_package -> leaf_trace_package) new_trace_dir="${TRACE_DIR}/${new_prefix}/${new_name}" [ -d "${new_trace_dir}" ] || leaf_error "upgrade: new trace dir missing: ${new_trace_dir}"