commit:     60a0ba78d26c1829b77ffa9aa59aac761a970b93
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 01:58:56 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 01:58:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=60a0ba78

Make sure $TMPDIR exists

Since commit 479b2386c8 we are using mktemp to create the temporary folder $TEMP
for the current genkernel run. However, when $TMPDIR doesn't exist, mktemp
will fail.

Reported-By: Aaron Bauman <bman <AT> gentoo.org>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 1 +
 genkernel      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 795c2c6..c5697e2 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -587,6 +587,7 @@ parse_cmdline() {
                        ;;
                --tempdir=*)
                        TMPDIR="${*#*=}"
+                       [ ! -d "${TMPDIR}" ] && mkdir -p "${TMPDIR}" || gen_die 
"Failed to create '${TMPDIR}'!"
                        TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
                        print_info 2 "TMPDIR: ${TMPDIR}"
                        print_info 2 "TEMP: ${TEMP}"

diff --git a/genkernel b/genkernel
index 676471c..6904ff2 100755
--- a/genkernel
+++ b/genkernel
@@ -44,6 +44,7 @@ source ${GK_SHARE}/gen_moddeps.sh || gen_die "Could not read 
${GK_SHARE}/gen_mod
 source ${GK_SHARE}/gen_package.sh || gen_die "Could not read 
${GK_SHARE}/gen_package.sh"
 source ${GK_SHARE}/gen_bootloader.sh || gen_die "Could not read 
${GK_SHARE}/gen_bootloader.sh"
 
+[ ! -d "${TMPDIR}" ] && mkdir -p "${TMPDIR}" || gen_die "Failed to create 
'${TMPDIR}'!"
 TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
 
 trap_cleanup(){
@@ -150,7 +151,7 @@ determine_config_file
 
 set_kernel_arch
 
-[ ! -f "${TEMP}" ] && mkdir -p "${TEMP}"
+[ ! -f "${TEMP}" ] && mkdir "${TEMP}" || gen_die "Failed to create '${TEMP}'!"
 
 setup_cache_dir
 

Reply via email to