New version, tarball, man page. Added support for Alpine Linux apk package manager for

the -r option. Fixed typos and glitches in man page as well.
This commit is contained in:
Harald Hope 2017-06-29 12:56:23 -07:00
parent 458f513ffa
commit 705094ed10
3 changed files with 38 additions and 7 deletions

23
inxi
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash
########################################################################
#### Script Name: inxi
#### Version: 2.3.22
#### Date: 2017-06-24
#### Version: 2.3.23
#### Date: 2017-06-29
#### Patch Number: 00
########################################################################
#### SPECIAL THANKS
@ -3131,7 +3131,7 @@ show_options()
print_lines_basic "1" "-o" "Unmounted $partition_string information (includes UUID and LABEL if available). Shows file system type if you have file installed, if you are root OR if you have added to /etc/sudoers (sudo v. 1.7 or newer) Example:^<username>^ALL^=^NOPASSWD:^/usr/bin/file^"
print_lines_basic "1" "-p" "Full $partition_string information (-P plus all other detected ${partition_string}s)."
print_lines_basic "1" "-P" "Basic $partition_string information (shows what -v^4 would show, but without extra data). Shows, if detected: / /boot /home /opt /tmp /usr /var /var/log /var/tmp . Use -p to see all mounted ${partition_string}s."
print_lines_basic "1" "-r" "Distro repository data. Supported repo types: APT; PACMAN; PISI; PORTAGE; PORTS (BSDs); SLACKPKG; URPMQ; YUM; ZYPP."
print_lines_basic "1" "-r" "Distro repository data. Supported repo types: APK; APT; PACMAN; PISI; PORTAGE; PORTS (BSDs); SLACKPKG; URPMQ; YUM; ZYPP."
print_lines_basic "1" "-R" "RAID data. Shows RAID devices, states, levels, and components, and extra data with -x/-xx. md-raid: If device is resyncing, shows resync progress line as well."
print_lines_basic "1" "-s" "Sensors output (if sensors installed/configured): mobo/cpu/gpu temp; detected fan speeds. Gpu temp only for Fglrx/Nvidia drivers. Nvidia shows screen number for > 1 screens."
print_lines_basic "1" "-S" "System information: host name, kernel, desktop environment (if in X), distro"
@ -10365,7 +10365,7 @@ get_repo_data()
local bsd_pkg_dir='/usr/local/etc/pkg/repos/' slackpkg_file='/etc/slackpkg/mirrors'
local netbsd_file='/usr/pkg/etc/pkgin/repositories.conf' freebsd_file='/etc/freebsd-update.conf'
local freebsd_pkg_file='/etc/pkg/FreeBSD.conf' slackpkg_plus_file='/etc/slackpkg/slackpkgplus.conf'
local portage_repo_dir='/etc/portage/repos.conf/'
local portage_repo_dir='/etc/portage/repos.conf/' apk_file='/etc/apk/repositories'
# apt - debian, buntus, also sometimes some yum/rpm repos may create apt repos here as well
if [[ -f $apt_file || -d $apt_file.d ]];then
@ -10690,6 +10690,21 @@ get_repo_data()
done <<< "$REPO_DATA"
# echo and execute the line breaks inserted
REPO_DATA="$( echo -e $repo_data_working )"
# alpine linux
elif [[ -f $apk_file ]];then
# note, only one file, but loop it in case more are added in future
for repo_file in $apk_file
do
if [[ -n $1 ]];then
cat $repo_file &> $1/repo-data_${repo_file//\//-}.txt
fi
repo_data_working="$( gawk -v repoFile="$repo_file" '
!/^[[:space:]]*$|^[[:space:]]*#/ {
print "APK repo^" repoFile "^" $0
}' $repo_file )"
get_repo_builder "$repo_data_working"
done
repo_data_working=''
elif [[ -f $ports_conf || -f $freebsd_file || -d $bsd_pkg_dir ]];then
if [[ -f $ports_conf ]];then
if [[ -n $1 ]];then

9
inxi.1
View file

@ -1,4 +1,4 @@
.TH INXI 1 "2017\-06\-24" inxi "inxi manual"
.TH INXI 1 "2017\-06\-29" inxi "inxi manual"
.SH NAME
inxi \- Command line system information script for console and IRC
.SH SYNOPSIS
@ -166,7 +166,7 @@ Note that \fB\-m\fR uses \fBdmidecode\fR, which must be run as root (or start \f
If memory information was found, and if the \fB\-I\fR line or the \fB\-tm\fR item have not been triggered,
will also print the ram used/total.
Because dmidecode data is extremely unreliable, inxi will try to make best guesses. If you see \fB(check)\fR after capacity number, you should check it for sure with specifications. \fB(est)\fR is slightly more reliable, but you should still check the real specifications before buying ram. Unfortunately there is nothing \fBinxi\fR can do to get truly reliable data about the system ram, maybe one day the kernel devs will put this data into \fB/sys\fR, and make it real data, taken from the actual system, not dmi data. For most people, the data will be right, but a significant percentage of users will have either wron max module size, if present, or max capacity.
Because dmidecode data is extremely unreliable, inxi will try to make best guesses. If you see \fB(check)\fR after capacity number, you should check it for sure with specifications. \fB(est)\fR is slightly more reliable, but you should still check the real specifications before buying ram. Unfortunately there is nothing \fBinxi\fR can do to get truly reliable data about the system ram, maybe one day the kernel devs will put this data into \fB/sys\fR, and make it real data, taken from the actual system, not dmi data. For most people, the data will be right, but a significant percentage of users will have either wrong max module size, if present, or max capacity.
.TP
.B \-M
Show machine data. Device, Motherboard, Bios, and if present, System Builder (Like Lenovo).
@ -209,6 +209,8 @@ Shows, if detected: \fB/ /boot /home /opt /tmp /usr /var /var/tmp /var/log\fR. U
.B \-r
Show distro repository data. Currently supported repo types:
\fBAPK\fR (Alpine Linux + derived versions)
\fBAPT\fR (Debian, Ubuntu + derived versions)
\fBPACMAN\fR (Arch Linux + derived versions)
@ -372,6 +374,7 @@ The following shows which lines / items get extra information with each extra da
\fB/etc/sudoers\fR (sudo v. 1.7 or newer):
.B <username> ALL = NOPASSWD: /usr/sbin/hddtemp (sample)
.TP
.B \-x \-G
\- Direct rendering status for Graphics.
@ -708,7 +711,7 @@ 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 Harald Hope
inxi version: Copyright (C) 2008\-17 Harald Hope
Initial CPU logic, konversation version logic, and occasional
maintenance fixes: Scott Rogers

View file

@ -1,3 +1,16 @@
=====================================================================================
Version: 2.3.23
Patch Version: 00
Script Date: 2017-06-29
-----------------------------------
Changes:
-----------------------------------
New version, tarball, man page. Added support for Alpine Linux apk package manager for
the -r option. Fixed typos and glitches in man page as well.
-----------------------------------
-- Harald Hope - Thu, 29 Jun 2017 12:54:21 -0700
=====================================================================================
Version: 2.3.22
Patch Version: 00