From: Michael Prokop <mika@grml.org>
Date: Thu, 12 Feb 2009 17:44:47 +0000 (+0100)
Subject: Exit if mktemp fails, use -u for HWINFO_TMP
X-Git-Tag: v0.4.2^0
X-Git-Url: http://git.grml.org/?p=grml-x.git;a=commitdiff_plain;h=50b29c2e24ab0f3be3d4aec175f955d92831158c

Exit if mktemp fails, use -u for HWINFO_TMP
---

diff --git a/grml-x b/grml-x
index 85ec3f0..fdf8a9d 100755
--- a/grml-x
+++ b/grml-x
@@ -39,9 +39,11 @@
   [ -n "$XINITRC" ] || XINITRC="$HOME/.xinitrc"
 
   # temporary files
-  HWINFO_TMP="$(mktemp)"
-  MONITORINFO="$(mktemp)"
-  MOUSEINFO="$(mktemp)"
+  # notice: we need the unsafe option, otherwise users other than root
+  # can not write to HWINFO_TMP, but we don't want to run hwinfo as root
+  HWINFO_TMP="$(mktemp -u)" || exit 1
+  MONITORINFO="$(mktemp)"   || exit 1
+  MOUSEINFO="$(mktemp)"     || exit 1
 
   if [ -z "$HWINFO_TMP" ] ; then
      echo "Fatal: could not create temporary file. Exiting.">&2