From 9baf5880bd74b0c96d1427a0efc660e0b0cba864 Mon Sep 17 00:00:00 2001 From: illiliti Date: Thu, 13 Feb 2020 03:36:13 +0300 Subject: [PATCH] simplify create_tmpdir --- generate | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/generate b/generate index 8fd5a93..d84b005 100755 --- a/generate +++ b/generate @@ -24,17 +24,13 @@ msg() { create_tmpdir() { if [ -n "$XDG_CACHE_HOME" ]; then tmpdir="${XDG_CACHE_HOME}/initramfs.$$" - mkdir "$tmpdir" - printf "%s\n" "$tmpdir" elif [ -n "$TMPDIR" ]; then tmpdir="${TMPDIR}/initramfs.$$" - mkdir "$tmpdir" - printf "%s\n" "$tmpdir" else tmpdir="/tmp/initramfs.$$" - mkdir "$tmpdir" - printf "%s\n" "$tmpdir" fi + + mkdir "$tmpdir" || msg panic "failed to create working directory" } # remove tmpdir @@ -403,6 +399,8 @@ create_initramfs() { # check root [ "$(id -u)" = 0 ] || msg panic "must be run as root" +create_tmpdir + # remove tmpdir on exit or unexpected error trap remove_tmpdir EXIT INT @@ -420,7 +418,6 @@ check_currentdir } # variables -tmpdir="$(create_tmpdir)" || msg panic "failed to create working directory" kernel="${kernel:-$(uname -r)}" moddir="/lib/modules"