diff --git a/inxi b/inxi index 9c7069d..b8b7bb1 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 2.2.23 -#### Date: 2015-06-08 +#### Version: 2.2.24 +#### Date: 2015-06-15 #### Patch Number: 00 ######################################################################## #### SPECIAL THANKS @@ -608,7 +608,7 @@ DISTROS_PRIMARY="arch-release gentoo-release redhat-release slackware-version Su DISTROS_LSB_GOOD="mandrake-release mandriva-release mandrakelinux-release" # this is being used both by core distros and derived distros now, eg, solusos 1 uses it for solusos id, while # debian, solusos base, uses it as well, so we have to know which it is. -DISTROS_OS_RELEASE_GOOD="arch-release SuSE-release" +DISTROS_OS_RELEASE_GOOD="arch-release SuSE-release " ## Distros with known problems # DSL (Bash 2.05b: grep -m doesn't work; arrays won't work) --> unusable output # Puppy Linux 4.1.2 (Bash 3.0: arrays won't work) --> works partially @@ -1947,9 +1947,23 @@ debug_data_collector() echo $GNOME_DESKTOP_SESSION_ID &> $debug_data_dir/gnome-desktop-session-id.txt # kde 3 id - echo $KDE_FULL_SESSION &> $debug_data_dir/kde3-ful-session.txt - echo $KDE_SESSION_VERSION &> $debug_data_dir/kde456-session-version.txt - echo "$(kded$KDE_SESSION_VERSION --version )" &> $debug_data_dir/kde-version-data.txt + echo $KDE_FULL_SESSION &> $debug_data_dir/kde3-full-session.txt + echo $KDE_SESSION_VERSION &> $debug_data_dir/kde-gte-4-session-version.txt + if type -p kded4 &>/dev/null; then + kded4 --version &> $debug_data_dir/kded4-version-data.txt + elif type -p kded5 &>/dev/null; then + kded5 --version &> $debug_data_dir/kded5-version-data.txt + elif type -p kded &>/dev/null; then + kded --version &> $debug_data_dir/kded-version-data.txt + else + touch $debug_data_dir/kded45-$KDE_SESSION_VERSION-absent + fi + # kde 5/plasma desktop 5, this is maybe an extra package and won't be used + if type -p about-distro &>/dev/null; then + about-distro &> $debug_data_dir/kde-about-distro.txt + else + touch $debug_data_dir/kde-about-distro-absent + fi echo $XDG_CURRENT_DESKTOP &> $debug_data_dir/xdg-current-desktop.txt fi if [[ $1 == 'disk' || $1 == 'all' ]];then @@ -4501,6 +4515,8 @@ get_desktop_environment() # works on 4, assume 5 will id the same, why not, no need to update in future # KDE_SESSION_VERSION is the integer version of the desktop + # NOTE: as of plasma 5, the tool: about-distro MAY be available, that will show + # actual desktop data, so once that's in debian/ubuntu, if it gets in, add that test if [[ $XDG_CURRENT_DESKTOP == 'KDE' || -n $KDE_SESSION_VERSION ]]; then # note the command is actually like, kded4 --version, so we construct it version_data=$( kded$KDE_SESSION_VERSION --version 2>/dev/null ) @@ -4963,8 +4979,11 @@ get_display_manager() for dm_id in $dm_id_list do # note: ${dm_id%.*}/$dm_id will create a dir name out of the dm id, then test if pid is in that - if [[ -f /run/$dm_id || -f /run/${dm_id%.*}/$dm_id || -f /var/run/$dm_id || \ - -f /var/run/${dm_id%.*}/$dm_id ]];then + # note: sddm, in an effort to be unique and special, do not use a pid/lock file, but rather a random + # string inside a directory called /run/sddm/ so assuming the existence of the pid inside a directory named + # from the dm. Hopefully this change will not have negative results. + if [[ -f /run/$dm_id || -d /run/${dm_id%.*}/ || -f /var/run/$dm_id || \ + -d /var/run/${dm_id%.*}/ ]];then # just on the off chance that two dms are running, good info to have in that case, if possible dm=$dm$separator${dm_id%.*} separator=',' diff --git a/inxi.changelog b/inxi.changelog index d9ce2ca..1c2e196 100755 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,73 @@ +===================================================================================== +Version: 2.2.24 +Patch Version: 00 +Script Date: 2015-06-15 +----------------------------------- +Changes: +----------------------------------- +new version, new tarball. Adapted to deal with yet another silly pointless change from +normal, in this case, sddm decided that using a .pid or .lock file in /run was too easy +so they changed to some session id type string in the /run/sddm/ directory. + +Speaking for myself, I find such pointless changes from anything resembling normal behaviors +to the reason that gnu freedesktop systems will never achieve significant desktop use globally. + +Also, in the same vein, added debuggers to try to figure out what plasma5/kde 5 is using +internally to give command line version information. Again, something pointless internally +was changed, thus breaking something that had faintly resembled an api, which is of course +why desktop gnu linux will never actually take off, developers in the real world have no +interest in chasing after such pointless and never ending churn in even the most trivial +areas of the OS, let alone the core. + +inxi remains however as a log of this ongoing churn and lack of discipline, and so remains +an interesting process of observation, and a way for users to try to avoid the constant +changes in simple system queries that should really never change, so I can see a reason +to keep it going since it's obvious that the actual foss ecosystem itself will not and apparently +cannot grasp that it is the lack of stable apis, methods, etc, that has kept desktop gnu linux +from achieving any actual real world success or popularity, and that is the actual problem +that should be fixed, not some pointless internal change to something. + +On the source repo front, maintainers, I still can't find an acceptable alternative to the +impending shutdown of googlecode. github is a for profit venture that people who seem totally +void of any sense of history believe is actually going to be around longer than say, sourceforge, +or googlecode, as a legitimate source hosting site. + +I'd welcome any suggestions. So far all the options are bad that I can find. + +Top preference is svn, but if git is the absolute only other choice for an otherwise good option, +I'd consider git, but it's a horrible option for inxi because of how inxi development and debugging +works, vs how git works. ie, svn branches are perfect, git branches are totally wrong. + +I may end up just hosting the svn on my own servers to avoid having to move yet again when the next +for profit flakey site decides to close up or monetize the source hosting. + +The original idea of googlecode was for google to 'pay its dues to the foss community', but apparently +they got bored with that idea, plus of course, the ongoing total failure of google to deal with +automated spam, which has always been a huge bug in the core google corporate culture. But googlecode +was by far the best option I've come across, it was done by a deep pocketed corporation not for profit +for pretty good reasons, and was never intended to be a profit center, which is the closest I could +see for a non free option. + +Setting up svn gui stuff however is a royal pain and requires ongoing maintainance for the life of +the software, which is NOT fun, nor will I sign up for that obligation. + +I may end up moving to github anyway, even though git truly sucks for inxi and myself, but it's an +idea I find fairly vile, apparently free software (sic) authors seem to have no grasp of the concept +of fredom when it comes to source code hosting, judging by the absurd popularity of github as the +default go to source repo. Their website is pathetic as well, which isn't very promising. + +So we'll see where it goes, I think I have until august to decide what to do for source hosting. + +Since I'm old enough to have seen sourceforge and now googlecode do the same thing, along with a lot +of other options, to say github won't do this too is delusional, what you can almost certainly say is it +will do it, the only question is when. But, just as Linus did with his non free linux kernel version +control, people will stick with the non free stuff until you realize you can't use it anymore, because +it is non free. Free software hosted on non free source repos is to me one of the most absurd and +stupid things I've ever heard of to be honest. + +----------------------------------- +-- Harald Hope - Mon, 15 Jun 2015 15:19:02 -0700 + ===================================================================================== Version: 2.2.23 Patch Version: 00