Don't `else' after return. Simplify control flow.

[nmh] / tools / showbuildenv

diff --git a/tools/showbuildenv b/tools/showbuildenv
index 93f5efefbffadb2034d944b7f3ec0303de415cd8..10c29bb4a4d74e78cd3e16ad702a34c062d4507e 100755 (executable)
--- a/tools/showbuildenv
+++ b/tools/showbuildenv
@@ -14,7 +14,7 @@
 # It jumps through hoops with `|| true' despite not using `set -e'.
 
 offset () {
 # It jumps through hoops with `|| true' despite not using `set -e'.
 
 offset () {

-    sed -e '/./s/^/    /'
+    sed -e '/./s/^/    /' "$@"

 }
 
 header () {
 }
 
 header () {


@@ -23,6 +23,21 @@ header () {
     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
 os=`uname`
 
 for i in a m p r s v; do