aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2016-12-05 19:45:07 -0500
committerLibravatarUnit 193 <unit193@ubuntu.com>2016-12-05 19:45:07 -0500
commitb2915b6e3c9f79e52ef1a57ec3b1e335555496f0 (patch)
tree4e9b4acdb5608ef8cdf35cf2d5e9bbc5c652d8fa
parent9c515513685aac18c06e624c5ff66e3f3d56f003 (diff)
parente1d7c88946542ce91cef3e428d92f683b4b2d52e (diff)
downloadinxi-b2915b6e3c9f79e52ef1a57ec3b1e335555496f0.tar.bz2
inxi-b2915b6e3c9f79e52ef1a57ec3b1e335555496f0.tar.xz
inxi-b2915b6e3c9f79e52ef1a57ec3b1e335555496f0.tar.zst
Merge tag 'upstream/2.3.5'
Upstream version 2.3.5 # gpg: Signature made Mon 05 Dec 2016 07:45:06 PM EST # gpg: using RSA key 5001E1B09AA3744B # gpg: issuer "unit193@ubuntu.com" # gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown] # gpg: aka "Unit 193 <unit193@gmail.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18 5A5C 5001 E1B0 9AA3 744B
-rwxr-xr-xinxi16
-rw-r--r--[-rwxr-xr-x]inxi.10
-rw-r--r--[-rwxr-xr-x]inxi.changelog28
3 files changed, 40 insertions, 4 deletions
diff --git a/inxi b/inxi
index bf7e39a..87276fd 100755
--- a/inxi
+++ b/inxi
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
########################################################################
#### Script Name: inxi
-#### Version: 2.3.4
-#### Date: 2016-11-03
+#### Version: 2.3.5
+#### Date: 2016-12-02
#### Patch Number: 00
########################################################################
#### SPECIAL THANKS
@@ -403,6 +403,14 @@ B_HDDTEMP_TESTED='false'
B_MODINFO_TESTED='false'
B_SUDO_TESTED='false'
+# cpu 64 bit able or not. Does not tell you actual kernel/OS installed
+# if ((1<<32)); then
+# BITS=64
+# else
+# BITS=32
+# fi
+# echo $BITS
+
### CONSTANTS/INITIALIZE - SOME MAY BE RESET LATER ###
DCOPOBJ="default"
DEBUG=0 # Set debug levels from 1-10 (8-10 trigger logging levels)
@@ -6209,7 +6217,7 @@ get_graphics_driver()
eval $LOGFS
# list is from sgfxi plus non-free drivers
- local driver_list='amdgpu|apm|ark|ati|chips|cirrus|cyrix|fbdev|fglrx|glint|i128|i740|intel|i810|imstt|mach64|mga|neomagic|nsc|nvidia|nv|openchrome|nouveau|radeon|radeonhd|rendition|s3virge|s3|savage|siliconmotion|sisusb|sis|tdfx|tga|trident|tseng|unichrome|vboxvideo|vesa|vga|via|voodoo|vmware|v4l'
+ local driver_list='amdgpu|apm|ark|ati|chips|cirrus|cyrix|fbdev|fglrx|glint|i128|i740|i810|iftv|imstt|intel|ivtv|mach64|mesa|mga|modesetting|neomagic|newport|nouveau|nsc|nvidia|nv|openchrome|radeonhd|radeon|rendition|s3virge|s3|savage|siliconmotion|sisusb|sis|tdfx|tga|trident|tseng|unichrome|v4l|vboxvideo|vesa|vga|via|vmware|voodoo'
local driver='' driver_string='' xorg_log_data='' status='' a_temp=''
if [[ $B_XORG_LOG == 'true' ]];then
@@ -14963,7 +14971,7 @@ print_weather_data()
time_string=''
observation_time=''
fi
- # the last three are oftenblank
+ # the last three are often blank
if [[ -z "$heat_index$wind_chill$dew_point" ]];then
weather_data=$( create_print_line " " "$pressure$location_string" )
print_screen_output "$weather_data"
diff --git a/inxi.1 b/inxi.1
index 9b97a30..9b97a30 100755..100644
--- a/inxi.1
+++ b/inxi.1
diff --git a/inxi.changelog b/inxi.changelog
index fb5a5ea..5483e86 100755..100644
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,4 +1,32 @@
=====================================================================================
+Version: 2.3.5
+Patch Version: 00
+Script Date: 2016-12-02
+-----------------------------------
+Changes:
+-----------------------------------
+New version, new tarball. This will matter to some users, inxi had failed to add 'modesetting'
+graphics driver, so it would not show in output, which causes support issues for users of that specific
+driver, like some cases of Intel. Also inxi would always have failed to show it unloaded in cases where
+radeon/nouveau were used but it had been loaded by xorg to begin with. So probably worth updating packages
+I'd say.
+
+-----------------------------------
+-- Harald Hope - Fri, 02 Dec 2016 16:00:57 -0800
+
+=====================================================================================
+Version: 2.3.4
+Patch Version: 00
+Script Date: 2016-11-03
+-----------------------------------
+Changes:
+-----------------------------------
+No new version, just fixed some unwanted executable bits in files.
+
+-----------------------------------
+-- Harald Hope - Tue, 22 Nov 2016 11:13:15 -0800
+
+=====================================================================================
Version: 2.3.4
Patch Version: 00
Script Date: 2016-11-03