diff --git a/inxi b/inxi index 85cb458..d7a6269 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 2.1.27 -#### Date: 2014-05-02 +#### Version: 2.1.28 +#### Date: 2014-05-05 #### Patch Number: 00 ######################################################################## #### SPECIAL THANKS @@ -4168,7 +4168,7 @@ get_desktop_environment() eval $LOGFS # set the default, this function only runs in X, if null, don't print data out - local desktop_environment='' xprop_root='' + local desktop_environment='' xprop_root='' version2='' local version='' version_data='' toolkit='' # works on 4, assume 5 will id the same, why not, no need to update in future @@ -4318,18 +4318,25 @@ get_desktop_environment() # note: openbox-lxde --version may be present, but returns openbox data version=$( get_program_version 'openbox' '^openbox' '2' ) if [[ $XDG_CURRENT_DESKTOP == 'LXDE' || \ - -n $( grep -is 'lxde' <<< "$Ps_aux_Data" ) ]];then + -n $( grep -is '/lxsession' <<< "$Ps_aux_Data" ) ]];then if [[ -n $version ]];then version="(Openbox $version)" fi desktop_environment='LXDE' - elif [[ -n $( grep -is 'razor-desktop' <<< "$Ps_aux_Data" ) ]];then + elif [[ $XDG_CURRENT_DESKTOP == 'Razor' || \ + -n $( grep -Eis '(razor-desktop|lxqt-session)' <<< "$Ps_aux_Data" ) ]];then + if [[ -n $( grep -is 'lxqt-session' <<< "$Ps_aux_Data" ) ]];then + desktop_environment='LXQt' + elif [[ -n $( grep -is 'razor-desktop' <<< "$Ps_aux_Data" ) ]];then + desktop_environment='Razor-QT' + else + desktop_environment='LX-Qt-Variant' + fi if [[ -n $version ]];then version="(Openbox $version)" fi - desktop_environment='Razor-QT' else - desktop_environment='Openbox' + desktop_environment='Openbox' fi elif [[ -n $( grep -is 'ICEWM' <<< "$xprop_root" ) ]];then version=$( get_program_version 'icewm' '^icewm' '2' ) diff --git a/inxi.changelog b/inxi.changelog index d5803b6..c55328c 100755 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,17 @@ +===================================================================================== +Version: 2.1.28 +Patch Version: 00 +Script Date: 2014-05-05 +----------------------------------- +Changes: +----------------------------------- +new version, new tarball. Adding tentative desktop id for LXQt, but I don't think +that this method will be super long lived, I expect LXDE to change how it shows itself +to the system when the gtk variant goes away. Good for lxde by the way in dumping gtk. + +----------------------------------- +-- Harald Hope - Mon, 05 May 2014 12:11:27 -0700 + ===================================================================================== Version: 2.1.27 Patch Version: 00