Remove unused NCWD and NPWD #defines.

[nmh] / tools / showbuildenv

diff --git a/tools/showbuildenv b/tools/showbuildenv
index ac34d076d602de884b30204d66f955dad165c18d..5eec6ee8c93089cae3b5f2f48c190ca64c848941 100755 (executable)
--- a/tools/showbuildenv
+++ b/tools/showbuildenv
@@ -14,15 +14,30 @@
 # It jumps through hoops with `|| true' despite not using `set -e'.
 
 offset () {
-    sed -e '/./s/^/    /'
+    sed -e '/./s/^/    /' "$@"
 }
 
 header () {
     echo
-    echo $*
+    echo "$@"
     echo
 }
 
+# os-release is the new s*stemd standard.  Then it's the more unique
+# ones with redhat-release bringing up the rear because other platforms
+# also use that to placate broken logic that use its prescence as a
+# use-RPM test.
+for f in \
+    /etc/os-release /etc/arch-release /etc/debian_version \
+    /etc/fedora-release /etc/gentoo-release /etc/redhat-release \
+    /etc/lsb-release \
+    ; do
+    test -f $f || continue
+    header $f
+    offset $f
+    break
+done
+
 os=`uname`
 
 for i in a m p r s v; do
@@ -51,8 +66,4 @@ case ${os} in
        (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