summaryrefslogtreecommitdiffstats
path: root/inxi
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2015-09-16 06:04:43 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2015-09-16 06:04:43 -0400
commitfde479e31ad8488c3616c404fab055a671810b61 (patch)
treec6c0777143312e2ef87f4c0900ac83ee5aed2143 /inxi
parent35ddf848228bfd4748f84d58a1d741d0623d2b66 (diff)
downloadinxi-fde479e31ad8488c3616c404fab055a671810b61.tar.bz2
inxi-fde479e31ad8488c3616c404fab055a671810b61.tar.xz
inxi-fde479e31ad8488c3616c404fab055a671810b61.tar.zst
Imported Upstream version 2.2.28upstream/2.2.28
Diffstat (limited to 'inxi')
-rwxr-xr-xinxi45
1 files changed, 30 insertions, 15 deletions
diff --git a/inxi b/inxi
index c65bb8f..fdebd47 100755
--- a/inxi
+++ b/inxi
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
########################################################################
#### Script Name: inxi
-#### Version: 2.2.27
-#### Date: 2015-08-02
+#### Version: 2.2.28
+#### Date: 2015-08-20
#### Patch Number: 00
########################################################################
#### SPECIAL THANKS
@@ -25,9 +25,14 @@
#### 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/wiki/svn: http://inxi.googlecode.com
+#### Current script home page/wiki/git: https://github.com/smxi/inxi
+#### Documentation/wiki pages will move to http://smxi.org soon.
#### Script forums: http://techpatterns.com/forums/forum-33.html
#### IRC support: irc.oftc.net channel #smxi
+#### Version control:
+#### * https://github.com/smxi/inxi
+#### * git: git pull https://github.com/smxi/inxi master
+#### * svn checkout url: https://github.com/smxi/inxi
####
#### 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
@@ -45,6 +50,9 @@
#### If you don't understand what Free Software is, please read (or reread)
#### this page: http://www.gnu.org/philosophy/free-sw.html
########################################################################
+
+####
+#### PACKAGE NAME NOTES
#### * Package names in (...) are the Debian Squeeze package name. Check your
#### distro for proper package name by doing this: which <application>
#### then find what package owns that application file. Or run --recommends
@@ -454,22 +462,23 @@ ALTERNATE_WEATHER_LOCATION='' # weather alternate location
LOG_FILE="$SCRIPT_DATA_DIR/inxi.log"
LOG_FILE_1="$SCRIPT_DATA_DIR/inxi.1.log"
LOG_FILE_2="$SCRIPT_DATA_DIR/inxi.2.log"
-MAN_FILE_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/inxi.1.gz'
+MAN_FILE_DOWNLOAD='https://github.com/smxi/inxi/raw/master/inxi.1.gz'
MAN_FILE_LOCATION='/usr/share/man/man1'
SCRIPT_NAME='inxi'
SCRIPT_PATCH_NUMBER=''
SCRIPT_PATH='' #filled-in in Main
SCRIPT_VERSION_NUMBER="" #filled-in in Main
-SCRIPT_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/'
-SCRIPT_DOWNLOAD_BRANCH_1='http://inxi.googlecode.com/svn/branches/one/'
-SCRIPT_DOWNLOAD_BRANCH_2='http://inxi.googlecode.com/svn/branches/two/'
-SCRIPT_DOWNLOAD_BRANCH_3='http://inxi.googlecode.com/svn/branches/three/'
-SCRIPT_DOWNLOAD_BRANCH_4='http://inxi.googlecode.com/svn/branches/four/'
-SCRIPT_DOWNLOAD_BRANCH_BSD='http://inxi.googlecode.com/svn/branches/bsd/'
-SCRIPT_DOWNLOAD_BRANCH_GNUBSD='http://inxi.googlecode.com/svn/branches/gnubsd/'
+SCRIPT_DOWNLOAD='https://github.com/smxi/inxi/raw/master/'
+SCRIPT_DOWNLOAD_BRANCH_1='https://github.com/smxi/inxi/raw/one/'
+SCRIPT_DOWNLOAD_BRANCH_2='https://github.com/smxi/inxi/raw/two/'
+SCRIPT_DOWNLOAD_BRANCH_3='https://github.com/smxi/inxi/raw/three/'
+SCRIPT_DOWNLOAD_BRANCH_4='https://github.com/smxi/inxi/raw/four/'
+SCRIPT_DOWNLOAD_BRANCH_BSD='https://github.com/smxi/inxi/raw/bsd/'
+SCRIPT_DOWNLOAD_BRANCH_GNUBSD='https://github.com/smxi/inxi/raw/gnubsd/'
SCRIPT_DOWNLOAD_DEV='http://smxi.org/test/'
# note, you can use any ip url here as long as it's the only line on the output page.
-# Also the ip address must be the last thing on that line.
+# Also the ip address must be the last thing on that line. If you abuse this ip tool
+# you will be banned from further access. Most > 24x daily automated queries to it are abuse.
WAN_IP_URL='http://smxi.org/opt/ip.php'
KONVI_CFG="konversation/scripts/$SCRIPT_NAME.conf" # relative path to $(kde-config --path data)
@@ -1357,7 +1366,7 @@ error_handler()
error_message="unsupported testing option argument: -! $2"
;;
12)
- error_message="the svn branch download url: $2\nappears to be empty currently. Make sure there is an actual svn branch version\nactive before you try this again. Check http://code.google.com/p/inxi\nto verify the branch status."
+ error_message="the git branch download url: $2\nappears to be empty currently. Make sure there is an actual svn branch version\nactive before you try this again. Check https://github.com/smxi/inxi\nto verify the branch status."
;;
13)
error_message="The -t option requires the following extra arguments (no spaces between letters/numbers):\nc m cm [required], for example: -t cm8 OR -t cm OR -t c9\n(numbers: 1-20, > 5 throttled to 5 in irc clients) You entered: $2"
@@ -1631,7 +1640,7 @@ debug_data_collector()
local xiin_app='' xiin_data_file='' xiin_download='' error='' b_run_xiin='false'
local debug_data_dir='' bsd_string='' xorg_d_files='' xorg_file='' a_distro_ids=''
local completed_gz_file='' xiin_file='xiin.py' ftp_upload='ftp.techpatterns.com/incoming'
- local xiin_url="http://inxi.googlecode.com/svn/branches/xiin/$xiin_file"
+ local xiin_url="https://github.com/smxi/inxi/raw/xiin/$xiin_file"
local Line='-------------------------' root_string=''
local start_directory=$( pwd )
local host=$( tr '[A-Z]' '[a-z]' <<< "$HOSTNAME" )
@@ -1781,6 +1790,12 @@ debug_data_collector()
touch $debug_data_dir/nvidia-smi-absent
fi
head -n 1 /proc/asound/card*/codec* &> $debug_data_dir/proc-asound-card-codec.txt
+ if [[ -f /proc/version ]];then
+ cat /proc/version &> $debug_data_dir/proc-version.txt
+ else
+ touch $debug_data_dir/proc-version-absent
+ fi
+ echo $CC &> $debug_data_dir/cc-content.txt
ls /usr/bin/gcc* &> $debug_data_dir/gcc-sys-versions.txt
if type -p gcc &>/dev/null;then
gcc --version &> $debug_data_dir/gcc-version.txt
@@ -3188,7 +3203,7 @@ print_version_info()
if [[ -n $script_symbolic_start ]];then
print_screen_output "Started via symbolic link: $script_symbolic_start"
fi
- print_lines_basic "0" "" "Website:^http://inxi.googlecode.com"
+ print_lines_basic "0" "" "Website:^https://github.com/smxi/inxi^or^http://smxi.org/"
print_lines_basic "0" "" "IRC:^irc.oftc.net channel:^#smxi"
print_lines_basic "0" "" "Forums:^http://techpatterns.com/forums/forum-33.html"
print_screen_output " "