mirror of
https://github.com/smxi/inxi.git
synced 2025-01-19 00:47:47 +00:00
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated
and made cleaner the version data in verbose mode, non irc. Fixed instance where program location would only show a dot . or relative path to inxi. Now in version full will show the full path, or should. Basic version line now show: inxi 1.8.30-00 (January 22 2013) The verbose information/version shows the license information, website/irc support info, and a few other changes. Also fixed a small bug where the copyright shows current year, not the actual year of the inxi copyright contained in the top comment header.
This commit is contained in:
inxi-svn
parent
8be350ff62
commit
b31926900b
64
inxi
64
inxi
|
|
@ -1,8 +1,8 @@
|
|||
#!/bin/bash
|
||||
########################################################################
|
||||
#### Script Name: inxi
|
||||
#### version: 1.8.30
|
||||
#### Date: January 22 2013
|
||||
#### version: 1.8.31
|
||||
#### Date: January 23 2013
|
||||
#### Patch Number: 00
|
||||
########################################################################
|
||||
#### SPECIAL THANKS
|
||||
|
|
@ -12,10 +12,10 @@
|
|||
########################################################################
|
||||
#### ABOUT INXI
|
||||
########################################################################
|
||||
#### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif
|
||||
#### inxi is a fork of infobash 3.02, the original bash sys info tool by locsmif
|
||||
#### As time permits functionality improvements and recoding will occur.
|
||||
####
|
||||
#### inxi, the universal, portable, system info script for irc.
|
||||
#### inxi, the universal, portable, system information tool for irc.
|
||||
#### Tested with Irssi, Xchat, Konversation, BitchX, KSirc, ircII,
|
||||
#### Gaim/Pidgin, Weechat, KVIrc and Kopete.
|
||||
#### Original infobash author and copyright holder:
|
||||
|
|
@ -25,8 +25,9 @@
|
|||
#### Steven Barrett (aka: damentz) - usb audio patch; swap percent used patch
|
||||
#### Jarett.Stevens - dmidecde -M patch for older systems with the /sys
|
||||
####
|
||||
#### Current script home page: http://techpatterns.com/forums/about1131.html
|
||||
#### Script svn: http://code.google.com/p/inxi
|
||||
#### Current script home page/wiki/svn: http://inxi.googlecode.com
|
||||
#### Script forums: http://techpatterns.com/forums/forum-33.html
|
||||
#### IRC support: irc.oftc.net channel #smxi
|
||||
####
|
||||
#### This program is free software; you can redistribute it and/or modify
|
||||
#### it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -107,7 +108,7 @@
|
|||
#### * All variables should clearly explain what they are, except counters like i, j.
|
||||
#### * Each word of Bash variable must be separated by '_' (underscore) (camel form), like: cpu_data
|
||||
#### * Each word of Gawk variable must be like this (first word lower, following start with upper): cpuData
|
||||
#### * Global variables are 'UPPER CASE', at top of script.
|
||||
#### * Global variables are 'UPPER CASE', at top of this file.
|
||||
#### ie, SOME_VARIABLE=''
|
||||
#### * Local variables are 'lower case' and declared at the top of the function using local, always.
|
||||
#### ie: local some_variable=''
|
||||
|
|
@ -133,7 +134,7 @@
|
|||
###################################################################################
|
||||
#### KDE Konversation information. Moving from dcop(qt3/KDE3) to dbus(qt4/KDE4)
|
||||
###################################################################################
|
||||
#### * dcop and dbus -- these talk back to Konversation from this script
|
||||
#### * dcop and dbus -- these talk back to Konversation from this program
|
||||
#### * Scripting info -- http://konversation.berlios.de/docs/scripting.html
|
||||
#### -- http://www.kde.org.uk/apps/konversation/
|
||||
#### * dbus info -- http://dbus.freedesktop.org/doc/dbus-tutorial.html
|
||||
|
|
@ -2353,25 +2354,34 @@ show_options()
|
|||
## print out version information for -V/--version
|
||||
print_version_info()
|
||||
{
|
||||
local last_modified=$( grep -im 1 'date:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3,$4,$5}' )
|
||||
|
||||
print_screen_output "$SCRIPT_NAME - the universal, portable, system info script for console and irc."
|
||||
print_screen_output "Version: $SCRIPT_VERSION_NUMBER-$SCRIPT_PATCH_NUMBER"
|
||||
print_screen_output "Script Last Modified: $last_modified"
|
||||
print_screen_output "Script Location: $SCRIPT_PATH"
|
||||
print_screen_output " "
|
||||
print_screen_output "Tested in Irssi, Xchat, Konversation, BitchX, KSirc, ircII,"
|
||||
print_screen_output "Gaim/Pidgin, Weechat, KVIrc, Quassel, Kopete, and others."
|
||||
print_screen_output " "
|
||||
print_screen_output "This script is a fork of Infobash 3.02, which is:"
|
||||
print_screen_output "Copyright (C) 2005-2007 Michiel de Boer a.k.a. locsmif"
|
||||
print_screen_output "Subsequent changes and modifications (after Infobash 3.02) are:"
|
||||
print_screen_output "Copyright (C) 2008-$(date +%y) Scott Rogers, Harald Hope, aka trash80 & h2"
|
||||
print_screen_output " "
|
||||
print_screen_output "This program is free software; you can redistribute it and/or modify"
|
||||
print_screen_output "it under the terms of the GNU General Public License as published by"
|
||||
print_screen_output "the Free Software Foundation; either version 3 of the License, or"
|
||||
print_screen_output "(at your option) any later version."
|
||||
# if not in PATH could be either . or directory name, no slash starting
|
||||
local script_path=$SCRIPT_PATH
|
||||
if [[ $script_path == '.' ]];then
|
||||
script_path=$( pwd )
|
||||
elif [[ -z $( grep '^/' <<< "$script_path" ) ]];then
|
||||
script_path="$( pwd )/$script_path"
|
||||
fi
|
||||
local last_modified=$( grep -m 1 '^#### Date:' $SCRIPT_PATH/$SCRIPT_NAME | gawk -F ': ' '{print $NF}' )
|
||||
local year_modified=$( gawk '{print $NF}' <<< "$last_modified" )
|
||||
|
||||
print_screen_output "$SCRIPT_NAME $SCRIPT_VERSION_NUMBER-$SCRIPT_PATCH_NUMBER ($last_modified)"
|
||||
if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
|
||||
print_screen_output " "
|
||||
print_screen_output "Program Location: $script_path"
|
||||
print_screen_output "Website: http://inxi.goooglecode.com - IRC: irc.oftc.net channel: #smxi"
|
||||
print_screen_output "Forums: http://techpatterns.com/forums/forum-33.html"
|
||||
print_screen_output " "
|
||||
print_screen_output "$SCRIPT_NAME - the universal, portable, system information tool for console and irc."
|
||||
print_screen_output "This program is a fork of Infobash 3.02:"
|
||||
print_screen_output "Copyright (C) 2005-2007 Michiel de Boer a.k.a. locsmif"
|
||||
print_screen_output "Subsequent changes and modifications (after Infobash 3.02):"
|
||||
print_screen_output "Copyright (C) 2008-$year_modified Scott Rogers, Harald Hope, aka trash80 & h2"
|
||||
print_screen_output " "
|
||||
print_screen_output "This program is free software; you can redistribute it and/or modify"
|
||||
print_screen_output "it under the terms of the GNU General Public License as published by"
|
||||
print_screen_output "the Free Software Foundation; either version 3 of the License, or"
|
||||
print_screen_output "(at your option) any later version. (http://www.gnu.org/licenses/gpl.html)"
|
||||
fi
|
||||
}
|
||||
|
||||
########################################################################
|
||||
|
|
|
|||
|
|
@ -54,3 +54,27 @@ Changing compression of inxi.1.gz to gzip -9 to fit lintian tests. This won't ma
|
|||
at this point so no need to change anything.
|
||||
-----------------------------------
|
||||
-- Harald Hope - Tue, 22 Jan 2013 19:27:54 -0800
|
||||
|
||||
=====================================================================================
|
||||
Version: 1.8.31
|
||||
Patch Version: 00
|
||||
Script Date: January 23 2013
|
||||
-----------------------------------
|
||||
Changes:
|
||||
-----------------------------------
|
||||
New version, new tarball. Fixed overly verbose output for --version/-V in irc. Also updated
|
||||
and made cleaner the version data in verbose mode, non irc.
|
||||
|
||||
Fixed instance where program location would only show a dot . or relative path to inxi. Now
|
||||
in version full will show the full path, or should.
|
||||
|
||||
Basic version line now show: inxi 1.8.30-00 (January 22 2013)
|
||||
|
||||
The verbose information/version shows the license information, website/irc support info, and
|
||||
a few other changes.
|
||||
|
||||
Also fixed a small bug where the copyright shows current year, not the actual year of the inxi
|
||||
copyright contained in the top comment header.
|
||||
|
||||
-----------------------------------
|
||||
-- Harald Hope - Wed, 23 Jan 2013 13:55:35 -0800
|
||||
|
|
|
|||
Loading…
Reference in a new issue