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. A desktop id fix, Mate id failed, mate moved to a more

Browse source 
long term solution to identify itself, so the hack I had in place fails on new MATE.

We'll see if this does it for various glitches, now quassel and mate latest should
again be working.
This commit is contained in:
inxi-svn 2015-05-13 20:18:38 +00:00
parent 1a1e84bc8c
commit 465c5e7752
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
inxi
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### Version: 2.2.20 #### Version: 2.2.21
#### Date: 2015-05-11 #### Date: 2015-05-13
#### Patch Number: 00 #### Patch Number: 00
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -1983,7 +1983,7 @@ debug_data_collector()
gpart status &> $debug_data_dir/bsd-gpart-status.txt gpart status &> $debug_data_dir/bsd-gpart-status.txt
swapctl -l -k &> $debug_data_dir/bsd-swapctl-l-k.txt swapctl -l -k &> $debug_data_dir/bsd-swapctl-l-k.txt
swapon -s &> $debug_data_dir/swapon-s.txt swapon -s &> $debug_data_dir/swapon-s.txt
sysctl -b kern.geom.conftxt &> $debug_data_dir/bsd-sysctl-b-kern.geom.conftxt.txt sysctl -b kern.geom.conftxt &> $debug_data_dir/bsd-sysctl-b-kern.geom.conftxt.txt
sysctl -b kern.geom.confxml &> $debug_data_dir/bsd-sysctl-b-kern.geom.confxml.txt sysctl -b kern.geom.confxml &> $debug_data_dir/bsd-sysctl-b-kern.geom.confxml.txt
zfs list &> $debug_data_dir/bsd-zfs-list.txt zfs list &> $debug_data_dir/bsd-zfs-list.txt
zpool list &> $debug_data_dir/bsd-zpool-list.txt zpool list &> $debug_data_dir/bsd-zpool-list.txt
@ -4597,7 +4597,7 @@ get_desktop_environment()
fi fi
fi fi
desktop_environment="Cinnamon" desktop_environment="Cinnamon"
elif [[ -n $xprop_root && -n $( grep -is '^_MARCO' <<< "$xprop_root" ) ]];then elif [[ $XDG_CURRENT_DESKTOP == 'MATE' ]] || [[ -n $xprop_root && -n $( grep -is '^_MARCO' <<< "$xprop_root" ) ]];then
version=$( get_program_version 'mate-about' '^MATE[[:space:]]DESKTOP' 'NF' ) version=$( get_program_version 'mate-about' '^MATE[[:space:]]DESKTOP' 'NF' )
# not certain cinn/mate will always have version, so keep output right if not # not certain cinn/mate will always have version, so keep output right if not
if [[ -n $version ]];then if [[ -n $version ]];then
@ -4794,6 +4794,7 @@ get_desktop_environment()
if [[ -n $version ]];then if [[ -n $version ]];then
version=" $version" version=" $version"
fi fi
log_function_data "desktop_environment version: $desktop_environment$version"
echo "$desktop_environment$version" echo "$desktop_environment$version"
eval $LOGFE eval $LOGFE
} }
@ -4832,7 +4833,7 @@ get_program_version()
version_data="$( $1 $get_version 2>/dev/null )" version_data="$( $1 $get_version 2>/dev/null )"
;; ;;
esac esac
log_function_data "version data: $version_data"
if [[ -n $version_data ]];then if [[ -n $version_data ]];then
version=$( gawk ' version=$( gawk '
BEGIN { BEGIN {
@ -4846,6 +4847,7 @@ get_program_version()
exit # quit after first match prints exit # quit after first match prints
}' <<< "$version_data" ) }' <<< "$version_data" )
fi fi
log_function_data "program version: $version"
echo $version echo $version
} }
@ -4869,6 +4871,7 @@ get_desktop_extra_data()
print desktops print desktops
} }
' ) ' )
log_function_data "de_data: $de_data"
echo $de_data echo $de_data
eval $LOGFE eval $LOGFE
@ -4939,6 +4942,7 @@ get_de_gtk_data()
fi fi
fi fi
fi fi
log_function_data "toolkit: $toolkit"
echo $toolkit echo $toolkit
eval $LOGFE eval $LOGFE

16
inxi.changelog
View file

@ -1,3 +1,19 @@
=====================================================================================
Version: 2.2.21
Patch Version: 00
Script Date: 2015-05-13
-----------------------------------
Changes:
-----------------------------------
New version, new tarball. A desktop id fix, Mate id failed, mate moved to a more
long term solution to identify itself, so the hack I had in place fails on new MATE.
We'll see if this does it for various glitches, now quassel and mate latest should
again be working.
-----------------------------------
-- Harald Hope - Wed, 13 May 2015 13:15:59 -0700
===================================================================================== =====================================================================================
Version: 2.2.20 Version: 2.2.20
Patch Version: 00 Patch Version: 00