Improve code layout (like checks for binaries, portability for non-grml system)

diff --git a/debian/changelog b/debian/changelog
index 07821ff..655ea0a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+grml-hwinfo (0.3-3) unstable; urgency=low
+
+  [Michael Prokop]
+  * Improve code layout (like checks for binaries, portability for
+    non-grml system).
+
+  [Alexander Wirt]
+  * Add procinfo to suggests.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 11 Jun 2007 12:06:28 +0200
+
 grml-hwinfo (0.3-2) unstable; urgency=low
 
   * Use "Architecture: all" in debian/control to support architectures

diff --git a/grml-hwinfo b/grml-hwinfo
index 3fed78d..8f428aa 100755 (executable)
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Aug 10 00:17:56 CEST 2006 [mika]
+# Latest change: Mon Jun 11 12:05:32 CEST 2007 [mika]
 ################################################################################
 # Notice: Some ideas have been taken from
 # http://club.black.co.at/david/hwdb/infodump
@@ -14,28 +14,44 @@
 # variables
 UNAME=$(uname -r)
 PN=$(basename $0)
-VERSION='0.2'
-if [[ -z "$INFOFILE" ]]; then
-  INFOFILE='info.tar.bz2'
+VERSION='0.3'
+if [ -z "$INFOFILE" ]; then
+   INFOFILE='info.tar.bz2'
 fi
 
+if [ "$(id -u)" != 0 ] ; then
+   NOTROOT=1
+   echo "Notice: you are running $PN without root permissions! Not all information could be collected!"
+   echo
+fi
+
+# check whether a binary is available and executable
+exectest() {
+if [ -z "$1" ] ; then
+   echo 'Usage: exectest <binary>'>&2
+   return 1
+else 
+   test -e "$(which $1)" && return 0 || return 1
+fi
+}
+
 # echo a list of all disks and their size
 # taken from http://cvs.debian.org/fai/lib/disk-info
-function diskandsize() {
+diskandsize() {
     local isdisk major minor blocks device suffix
     while read major minor blocks device suffix; do
         isdisk=1
         # skip ide cdrom
         [ -f /proc/ide/$device/media ] && grep -q cdrom /proc/ide/$device/media && isdisk=0
-        [ $isdisk -eq 1 ] && echo "$device $blocks"
+        [ "$isdisk" -eq 1 ] && echo "$device $blocks"
     done
 }
 
-function list_disks() {
+list_disks() {
 # print only every second entry; used by disk_info
 i=0
 for ent in $@; do
-    if [ $i -eq 0 ]; then
+    if [ "$i" -eq 0 ]; then
         echo $ent
         i=1
     else
@@ -44,11 +60,9 @@ for ent in $@; do
 done
 }
 
-function disk_info() {
+disk_info() {
     # the variable holds a space separated list of devices and their block size
     device_size=`grep -E ' cciss/c.d.$| ida/c.d.$| rd/c.d.$| hd.$| sd.$|/disc$' /proc/partitions | diskandsize`
-# grep -E ' cciss/c.d.\b| ida/c.d.\b| rd/c.d.\b| hd.\b| sd.\b|/disc\b' /proc/partitions | diskandsize
-
     # a list of all local disks, without size
     disklist=`list_disks $device_size`
 }
@@ -67,11 +81,11 @@ mkdir info || exit -1
 # some sysinfo
   date > date
   if [ -r /etc/grml_version ] ; then
-    cat /etc/grml_version > grml_version
-  else
-    echo "This does not seem to be a grml system. Continuing anyway..."
+     cat /etc/grml_version > grml_version
+  fi
+  if [ -r /etc/debian_version ] ; then
+     cat /etc/debian_version > debian_version
   fi
-  cat /etc/debian_version > debian_version
   uname -a > uname
 
 # disks / devices
@@ -83,7 +97,7 @@ mkdir info || exit -1
   [ -r /proc/ide/ide?/hd?/geometry ] && grep . /proc/ide/ide?/hd?/geometry /dev/null | sed -e 's#/proc/ide/ide./##' > proc_ide
   df -h > df 2>/dev/null
   for i in free lsmod mount lsdev ; do
-    [[ -x `which $i` ]] && $i > $i
+      exectest $i  && $i > $i
   done
 
 # proc stuff
@@ -91,51 +105,53 @@ mkdir info || exit -1
     mdstat meminfo modules mtrr pci version ; do
     [ -r /proc/$i ] && cat /proc/$i > proc_$i
   done
-  [[ -x `which sysdump` ]] && sysdump > sysdump 2>sysdump.error
+  exectest sysdump  && sysdump > sysdump 2>sysdump.error
 # for sysnet in `find /proc/sys/net/*/ -type f | grep -v flush`; do cat $sysnet >> sysnet ; done
 
 # log
   dmesg > dmesg.cur
 
 # hwinfo
-  [[ -x `which discover` ]] && discover -v --type-summary --enable-bus all > discover 2> discover.2
-  [[ -x `which hwinfo` ]] && hwinfo log=hwinfo
+  exectest discover && discover -v --type-summary --enable-bus all > discover 2> discover.2
+  exectest hwinfo   && hwinfo log=hwinfo
 
 # net stuff
-  [[ -x `which ifconfig` ]] && ifconfig -v -a  > ifconfig
-  [[ -x `which ip` ]] && ip route show   > ip_route
-  [[ -x `which ip` ]] && ip link show    > ip_link
-  [[ -x `which route` ]] && route -n        > route
+  exectest ifconfig  && ifconfig -v -a  > ifconfig
+  exectest ip        && ip route show   > ip_route
+  exectest ip        && ip link show    > ip_link
+  exectest route     && route -n        > route
 
 # software
-  dpkg --get-selections   > dpkg_get_selections
-  COLUMNS=300 dpkg --list > dpkg_list
-  COLUMNS=1000 dpkg -l linux-image-$UNAME | grep linux-image-$UNAME | tr -s ' ' > running_kernel
+  if exectest dpkg ; then
+     dpkg --get-selections   > dpkg_get_selections
+     COLUMNS=300 dpkg --list > dpkg_list
+     COLUMNS=1000 dpkg -l linux-image-$UNAME | grep linux-image-$UNAME | tr -s ' ' > running_kernel
+  fi
 
 # powermanagement
-  [[ -x `which laptop-detect` ]] && laptop-detect 1>/dev/null 2>/dev/null && echo "0" > laptop_detected
-  [[ -x `which acpi_available` ]] && acpi_available && cat /proc/acpi/info > acpi_info
-  [[ -x `which acpi` ]] && acpi > acpi 2> acpi.error && acpi -v > acpi.version
+  exectest laptop-detect  && laptop-detect 1>/dev/null 2>/dev/null && echo "0" > laptop_detected
+  exectest acpi_available  && acpi_available && cat /proc/acpi/info > acpi_info
+  exectest acpi  && acpi > acpi 2> acpi.error && acpi -v > acpi.version
   [ -r /proc/apm/  ]  && apm > acpi
 
 # kernel stuff
   if [ -r /proc/config.gz ] ; then
-    zcat /proc/config.gz > kernelconfig
+     zcat /proc/config.gz > kernelconfig
   else
-    [ -r /boot/config-$UNAME ] && cat /boot/config-$UNAME > kernelconfig
+     [ -r /boot/config-$UNAME ] && cat /boot/config-$UNAME > kernelconfig
   fi
 
 # X stuff
   if [ -n "${DISPLAY}" ] ; then
-    [[ -x `which xviddetect` ]] && xviddetect         > xviddetect
-    [[ -x `which xvidtune`   ]] && xvidtune -show     > xdivtune
-    [[ -x `which xrandr`     ]] && xrandr             > xrandr
-    [[ -x `which xdpyinfo`   ]] && xdpyinfo           > xdpyinfo
-    X -version        1> x_version 2>&1
+     exectest xviddetect  && xviddetect         > xviddetect
+     exectest xvidtune    && xvidtune -show     > xdivtune
+     exectest xrandr      && xrandr             > xrandr
+     exectest xdpyinfo    && xdpyinfo           > xdpyinfo
+     X -version        1> x_version 2>&1
   fi
 
   for i in Xorg.0.log Xorg.7.log Xorg.8.log XFree86.0.log XFree86.7.log XFree86.8.log dmesg ; do
-    cp /var/log/$i log_$i 2>/dev/null
+      cp /var/log/$i log_$i 2>/dev/null
   done
 
   cp /etc/X11/xorg.conf    xorg.conf    2>/dev/null
@@ -146,52 +162,29 @@ mkdir info || exit -1
 # sysinfo -class device -level all
 
 # as root:
-if [ $UID != 0 ] ; then
-  echo "not running as root" > root
-  NOTROOT="yes"
+if [ -n "$NOTROOT" ] ; then
+   echo "not running as root" > root
 else
-  echo "running as root" > root
-  disk_info
-  [[ -x `which sfdisk`    ]] && sfdisk -d > sfdisk 2>sfdisk.error
-  [[ -x `which ddcprobe`  ]] && ddcprobe  > ddcprobe
-  [[ -x `which dmidecode` ]] && dmidecode > dmidecode
-  for disk in $disklist; do
-     [[ -x `which smartctl` ]] && smartctl -i /dev/$disk >> smartctl
-     [[ -x `which hdparm`   ]] && hdparm -iv /dev/$disk  >> hdparm
-     [[ -x `which fdisk`    ]] && fdisk -lu /dev/$disk   >> fdisk 2>>fdisk.error
-     [[ -x `which parted`   ]] && parted -s /dev/$disk print >> parted
-     LC_ALL=C file -s /dev/$disk?* | grep -v ": empty" >> file_disk
-  done
+   echo "running as root" > root
+   disk_info
+   exectest sfdisk     && sfdisk -d > sfdisk 2>sfdisk.error
+   exectest ddcprobe   && ddcprobe  > ddcprobe
+   exectest dmidecode  && dmidecode > dmidecode
+   for disk in $disklist; do
+      exectest smartctl  && smartctl -i /dev/$disk >> smartctl
+      exectest hdparm    && hdparm -iv /dev/$disk  >> hdparm
+      exectest fdisk     && fdisk -lu /dev/$disk   >> fdisk 2>>fdisk.error
+      exectest parted    && parted -s /dev/$disk print >> parted
+      LC_ALL=C file -s /dev/$disk?* | grep -v ": empty" >> file_disk
+   done
 fi
 )
 
+# finally create the tarball
 tar jcf $INFOFILE info/ && rm -Rf info/
 
-echo ""
-[ -n "$NOTROOT" ]  && echo "Notice: you are running $PN without root permissions! Not all information could be collected!"
-echo ""
+echo
 [ -r "$INFOFILE" ] && echo "$INFOFILE ($(ls -ahl $INFOFILE | awk '{print $5}')) has been generated."
-echo ""
-
-#echo ""
-#echo 'Thanks for collecting this information!'
-#echo ""
-#echo "Please fill out this form and send it together with $INFOFILE ($(ls -ahl $INFOFILE | awk '{print $5}')) to"
-#echo "  Michael Prokop <mika@grml.org>"
-#echo ""
-#
-#cat <<EOF
-#Class: <Laptop/Desktop/Server/built-to-order/self-assembled>
-#Manufacturer:
-#Model:
-#Distributor: <Where did you buy it>
-#Bought in: <Country and Date>
-#
-#Components/Options: <If the PC was built-to-order or self assembled, please
-#        list the options or components you used>
-#
-#Additional Notes:
-#
-#EOF
+echo
 
 ## END OF FILE##################################################################