summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-09-02 10:22:39 +0100
committerLeah Rowe <leah@libreboot.org>2023-09-02 10:22:39 +0100
commit4885c7962d493087ab916e59040b134b8d2fabf7 (patch)
treea3de7267bd04a4bcd026734abc473db03b37e8f3
parent56f16bc88357054ac19318e5e4f293a4d9776752 (diff)
handle TMPDIR from include/export.sh
it looks a bit cluttered just sitting there in the main script. make it an include. Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xinclude/export.sh22
-rwxr-xr-xlbmk21
2 files changed, 23 insertions, 20 deletions
diff --git a/include/export.sh b/include/export.sh
new file mode 100755
index 00000000..9e393485
--- /dev/null
+++ b/include/export.sh
@@ -0,0 +1,22 @@
+# Copyright (c) 2023 Leah Rowe <leah@libreboot.org>
+# SPDX-License-Identifier: MIT
+
+tmpdir=""
+tmpdir_was_set="y"
+set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"
+if [ "${tmpdir_was_set}" = "y" ]; then
+ tmpdir="${TMPDIR##*/}"
+ tmpdir="${TMPDIR%_*}"
+ if [ "${tmpdir}" = "lbmk" ]; then
+ tmpdir=""
+ tmpdir_was_set="n"
+ fi
+fi
+if [ "${tmpdir_was_set}" = "n" ]; then
+ export TMPDIR="/tmp"
+ tmpdir="$(mktemp -d -t lbmk_XXXXXXXX)"
+ export TMPDIR="${tmpdir}"
+else
+ export TMPDIR="${TMPDIR}"
+fi
+tmpdir="${TMPDIR}"
diff --git a/lbmk b/lbmk
index 175cf394..285e109f 100755
--- a/lbmk
+++ b/lbmk
@@ -25,26 +25,7 @@
set -u -e
. "include/err.sh"
-
-tmpdir=""
-tmpdir_was_set="y"
-set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"
-if [ "${tmpdir_was_set}" = "y" ]; then
- tmpdir="${TMPDIR##*/}"
- tmpdir="${TMPDIR%_*}"
- if [ "${tmpdir}" = "lbmk" ]; then
- tmpdir=""
- tmpdir_was_set="n"
- fi
-fi
-if [ "${tmpdir_was_set}" = "n" ]; then
- export TMPDIR="/tmp"
- tmpdir="$(mktemp -d -t lbmk_XXXXXXXX)"
- export TMPDIR="${tmpdir}"
-else
- export TMPDIR="${TMPDIR}"
-fi
-tmpdir="${TMPDIR}"
+. "include/export.sh"
projectname="$(cat projectname)"
buildpath=""