From 31e65c738ccef5e919a452917776cf09beee3c15 Mon Sep 17 00:00:00 2001 From: Harald Hope Date: Tue, 20 Dec 2016 19:57:41 -0800 Subject: [PATCH] No new version. New tarball, man. Small text changes and cleanup and updates in man page, but no actual meaningful changes. Feel free to ignore this one if you just did 2.3.6. --- inxi | 8 ++++---- inxi.1 | 25 ++++++++++++++++++------- inxi.changelog | 13 +++++++++++++ 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/inxi b/inxi index e47007c..72c7ebd 100755 --- a/inxi +++ b/inxi @@ -20,7 +20,8 @@ #### Gaim/Pidgin, Weechat, KVIrc and Kopete. #### Original infobash author and copyright holder: #### Copyright (C) 2005-2007 Michiel de Boer a.k.a. locsmif -#### inxi version: Copyright (C) 2008-2016 Scott Rogers & Harald Hope +#### inxi version: Copyright (C) 2008-2016 Harald Hope +#### Additional features (C) Scott Rogers - kde, cpu info #### Further fixes (listed as known): Horst Tritremmel #### Steven Barrett (aka: damentz) - usb audio patch; swap percent used patch #### Jarett.Stevens - dmidecde -M patch for older systems with the /sys @@ -677,8 +678,7 @@ USB_NETWORK_SEARCH="$USB_NETWORK_SEARCH|050d:935b|0bda:8189|0bda:8197" ######################################################################## main() { - # Source user config variables override /etc/inxi.conf variables - # this must be set first so log paths are present. + # This must be set first so log paths are present when logging starts. set_user_paths eval $LOGFS @@ -695,7 +695,7 @@ main() if [[ -s /etc/$SCRIPT_NAME.conf ]];then source /etc/$SCRIPT_NAME.conf fi - + # Source user config variables override /etc/inxi.conf variables if [[ -s $SCRIPT_CONFIG_DIR/$SCRIPT_NAME.conf ]];then source $SCRIPT_CONFIG_DIR/$SCRIPT_NAME.conf fi diff --git a/inxi.1 b/inxi.1 index ee83e68..2f50296 100644 --- a/inxi.1 +++ b/inxi.1 @@ -1,4 +1,4 @@ -.TH INXI 1 "2016\-12\-19" inxi "inxi manual" +.TH INXI 1 "2016\-12\-20" inxi "inxi manual" .SH NAME inxi \- Command line system information script for console and IRC .SH SYNOPSIS @@ -649,16 +649,30 @@ is is a fork of locsmif's largely unmaintained yet very clever, infobash script. Original infobash author and copyright holder: Copyright (C) 2005\-2007 Michiel de Boer a.k.a. locsmif -inxi version: Copyright (C) 2008\-16 Scott Rogers & Harald Hope +inxi version: Copyright (C) 2008\-16 Harald Hope -Further fixes (listed as known): Horst Tritremmel +Initial CPU logic, konversation version logic, and occasional +maintenance fixes: Scott Rogers + +Further fixes (listed as known): + +Horst Tritremmel Steven Barrett (aka: damentz) \- usb audio patch; swap percent used patch. + Jarett.Stevens \- dmidecode \-M patch for older systems with no /sys And a special thanks to the nice people at irc.oftc.net channels #linux\-smokers\-club and #smxi, who all really have to be considered to be co\-developers because of their non\-stop enthusiasm -and willingness to provide real time testing and debugging of inxi development. +and willingness to provide real time testing and debugging of inxi development. + +A further thanks to the Siduction forum members, who have helped get some features +working by providing a lot of datasets that revealed possible variations, particularly +for the ram \fB\-m\fR option. + +Further thanks to the various inxi package maintainers, distro support people, forum +moderators, and in particular, sys admins with their particular issues, which almost always +help make inxi better, and any others who contribute ideas, suggestions, and patches. Without a wide range of diverse Linux kernel based Free Desktop systems to test on, we could never have gotten inxi to be as reliable and solid as it's turning out to be. @@ -666,8 +680,5 @@ never have gotten inxi to be as reliable and solid as it's turning out to be. And of course, big thanks locsmif, who figured out a lot of the core methods, logic, and tricks used in inxi. -Further thanks to the various inxi package maintainers, distro support people, forum -moderators, and others, who contribute ideas, suggestions, and patches. - This Man page was originally created by Gordon Spencer (aka aus9) and is maintained by Harald Hope (aka h2 or TechAdmin). diff --git a/inxi.changelog b/inxi.changelog index 82d897f..74c636c 100644 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,16 @@ +===================================================================================== +Version: 2.3.6 +Patch Version: 00 +Script Date: 2016-12-20 +----------------------------------- +Changes: +----------------------------------- +No new version. New tarball, man. Small text changes and cleanup and updates in man page, +but no actual meaningful changes. Feel free to ignore this one if you just did 2.3.6. + +----------------------------------- +-- Harald Hope - Tue, 20 Dec 2016 19:53:54 -0800 + ===================================================================================== Version: 2.3.6 Patch Version: 00