From 49d9d82862b2ded52ba096d804f8bfe4f99d6ff9 Mon Sep 17 00:00:00 2001 From: Harald Hope Date: Thu, 8 Jun 2017 21:04:08 -0700 Subject: [PATCH] Tiny change, new version, tarball. Tumbleweed distro id fix. --- inxi | 7 ++++--- inxi.changelog | 12 ++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/inxi b/inxi index 58d16d5..f0d9e75 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 2.3.15 +#### Version: 2.3.16 #### Date: 2017-06-08 #### Patch Number: 00 ######################################################################## @@ -5966,7 +5966,7 @@ get_distro_lsb_os_release_data() } # note: adding the spacing directly to variable to make sure distro output is null if not found /^PRETTY_NAME/ { - if ( $2 != "n/a" ) { + if ( $2 != "n/a" ) { prettyName = $2 } } @@ -5984,7 +5984,8 @@ get_distro_lsb_os_release_data() } } END { - if ( prettyName != "" ) { + # NOTE: tumbleweed has pretty name but pretty name does not have version id + if ( prettyName != "" && regularName !~ /tumbleweed/ ) { distroName = prettyName } else if ( regularName != "" ) { diff --git a/inxi.changelog b/inxi.changelog index e33df93..8bbf6ad 100644 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,15 @@ +===================================================================================== +Version: 2.3.16 +Patch Version: 00 +Script Date: 2017-06-08 +----------------------------------- +Changes: +----------------------------------- +Tiny change, new version, tarball. Tumbleweed distro id fix. + +----------------------------------- +-- Harald Hope - Thu, 08 Jun 2017 21:02:53 -0700 + ===================================================================================== Version: 2.3.15 Patch Version: 00