From: Michael Prokop <mika@grml.org>
Date: Mon, 11 Jun 2007 10:21:59 +0000 (+0200)
Subject: Adjust timestamp in filename and infotext for non-root usage
X-Git-Tag: 0.3.4~4
X-Git-Url: http://git.grml.org/?p=grml-hwinfo.git;a=commitdiff_plain;h=e73ccbe63eb720f0db78fa3aa332be4c4ca6a1a1

Adjust timestamp in filename and infotext for non-root usage
---

diff --git a/grml-hwinfo b/grml-hwinfo
index b96d2e8..7ca5c18 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -21,7 +21,7 @@ VERSION='0.3'
 
 if [ "$(id -u)" != 0 ] ; then
    NOTROOT=1
-   echo "Notice: you are running $PN without root permissions! Not all information could be collected!"
+   echo "Notice: you are running $PN without root permissions. Not all information will be collected."
    echo
 fi
 
@@ -182,10 +182,12 @@ fi
 
 # finally create the tarball
 if [ -f "$INFOFILE" ] ; then
-   DATE="$(date +%Y%m%d_%H:%M:%S)"
-   INFOFILE="info_$DATE.tar.bz2"
-   echo "Warning:  $INFOFILE exists already, using $INFOFILE instead.">&1
-   tar jcf $INFOFILE info/ && rm -Rf info/
+   DATE="$(date +%Y%m%d_%H%M%S)"
+   NEW_INFOFILE="info_$DATE.tar.bz2"
+   echo
+   echo "Warning:  $INFOFILE exists already, using $NEW_INFOFILE instead.">&2
+   tar jcf $NEW_INFOFILE info/ && rm -Rf info/
+   INFOFILE="$NEW_INFOFILE" # adjust variable for final info message
 else
    tar jcf $INFOFILE info/ && rm -Rf info/
 fi