dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2025-01-31 18:12:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

New version, new tarball. Some systems are showing a new xfce syntax in the xrop -root

Browse source 
output, like so, instead of the old quotes "XFCE4" it shows like this:

XFCE_DESKTOP_WINDOW(WINDOW): window id # 0x1000003

Updated and added a much less strict fallback test case.
This commit is contained in:
inxi-svn 2014-08-21 02:46:20 +00:00
parent 99d4b0292e
commit 007913cf38
2 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
inxi
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### Version: 2.2.0 #### Version: 2.2.1
#### Date: 2014-08-18 #### Date: 2014-08-20
#### Patch Number: 00 #### Patch Number: 00
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -4313,6 +4313,27 @@ get_desktop_environment()
fi fi
fi fi
desktop_environment="Xfce" desktop_environment="Xfce"
# case where no xfce number exists, just xfce
elif [[ -n $( grep -is 'xfce' <<< "$xprop_root" ) ]];then
version=$( get_program_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
# arch linux reports null, so use alternate if null
if [[ -z $version ]];then
version=$( get_program_version 'xfce4-panel' '^xfce5-panel' '2' )
if [[ -z $version ]];then
# version=$( get_program_version 'xfce5-panel' '^xfce5-panel' '2' )
#if [[ -z $version ]];then
# version='5'
#fi
version='4'
fi
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_program_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
if [[ -n $toolkit ]];then
version="$version (Gtk $toolkit)"
fi
fi
desktop_environment="Xfce"
elif [[ -n $( grep -is 'BLACKBOX_PID' <<< "$xprop_root" ) ]];then elif [[ -n $( grep -is 'BLACKBOX_PID' <<< "$xprop_root" ) ]];then
if [[ -n $( grep -is 'fluxbox' <<< "$Ps_aux_Data" ) ]];then if [[ -n $( grep -is 'fluxbox' <<< "$Ps_aux_Data" ) ]];then
version=$( get_program_version 'fluxbox' '^fluxbox' '2' ) version=$( get_program_version 'fluxbox' '^fluxbox' '2' )
@ -5941,7 +5962,7 @@ get_init_data()
if [[ -n $strings_init_version ]];then if [[ -n $strings_init_version ]];then
init_version=$( gawk '{print $2}' <<< "$strings_init_version" ) init_version=$( gawk '{print $2}' <<< "$strings_init_version" )
fi fi
# missing data: # missing data: note, runit can install as a dependency without being the init system
# http://smarden.org/runit/sv.8.html # http://smarden.org/runit/sv.8.html
elif [[ -e /sbin/runit-init || -e /etc/runit || -n $( type -p sv ) ]];then elif [[ -e /sbin/runit-init || -e /etc/runit || -n $( type -p sv ) ]];then
init_type='runit' # lower case init_type='runit' # lower case

17
inxi.changelog
View file

@ -1,3 +1,20 @@
=====================================================================================
Version: 2.2.1
Patch Version: 00
Script Date: 2014-08-20
-----------------------------------
Changes:
-----------------------------------
New version, new tarball. Some systems are showing a new xfce syntax in the xrop -root
output, like so, instead of the old quotes "XFCE4" it shows like this:
XFCE_DESKTOP_WINDOW(WINDOW): window id # 0x1000003
Updated and added a much less strict fallback test case.
-----------------------------------
-- Harald Hope - Wed, 20 Aug 2014 19:43:59 -0700
===================================================================================== =====================================================================================
Version: 2.2.00 Version: 2.2.00
Patch Version: 00 Patch Version: 00