Don't use working directory when --output-directory option is used

[grml-hwinfo.git] / grml-hwinfo

diff --git a/grml-hwinfo b/grml-hwinfo
index 1b572f4..75567b2 100755 (executable)
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -112,7 +112,12 @@ fi
 
 # Generate output/temporary directory name & path, and output file path
 [ -n "$OUTDIRNAME" ] || OUTDIRNAME="grml-hwinfo-${DATE}"
-OUTDIR="${WORKING_DIR}/${OUTDIRNAME}"
+if $_opt_output_directory ; then
+  OUTDIR="${OUTDIRNAME}"
+else
+  OUTDIR="${WORKING_DIR}/${OUTDIRNAME}"
+fi
+
 if $_opt_force ; then
   mkdir -p "${OUTDIR}"
 else
@@ -156,7 +161,7 @@ checkdisk() {
   while read _ _ _ device _ ; do
     isdisk=1
     # skip CDROMs
-    [ "$(stat -c %G /dev/$device)" = "disk" ] || isdisk=0
+    [ "$(stat -c %G /dev/"${device}")" = "disk" ] || isdisk=0
     [ "$isdisk" -eq 1 ] && echo "$device"
   done
 }