X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ecc4ea809452d95ab51ff8669d66fe0549260377..792d7e1eb3ef80e73646fb060bfe9ab776752310:/tools/showbuildenv

diff --git a/tools/showbuildenv b/tools/showbuildenv
index 089eea75..2338bc6c 100755
--- a/tools/showbuildenv
+++ b/tools/showbuildenv
@@ -5,16 +5,13 @@
 # build environment on machines they can't login on.  It also provides
 # a history in the build logs that might be useful in catching
 # regressions.
-# 
+#
 # This script should *only* report basic information about the build
 # environment, and only that necessary to reproduce the build
 # environment.
-#
-# FIXME: Document meaning of script's exit status, if any.
-# It jumps through hoops with `|| true' despite not using `set -e'.
 
 offset () {
-    sed -e '/./s/^/    /'
+    sed -e '/./s/^/    /' "$@"
 }
 
 header () {
@@ -34,7 +31,7 @@ for f in \
     ; do
     test -f $f || continue
     header $f
-    cat $f
+    offset $f
     break
 done
 
@@ -63,11 +60,8 @@ case ${os} in
 	cc -v 2>&1 | offset
 
   	header Installed packages:
+        #### pkg(7) or pkg_info(1) might not always be available.
 	(pkg info 2>/dev/null | offset) || true
 	(pkg_info 2>/dev/null | offset) || true
 	;;
-
-    Linux)
-        header Linux distribution:
-        (lsb_release -a 2>&1 | offset) || true
 esac