Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Simplify XFCE desktop detection #52

Merged
merged 1 commit into from

3 participants

@bogdan

Current expression doesn't work on my machine by some reason.

$ xprop -root _DT_SAVE_MODE       
_DT_SAVE_MODE(STRING) = "xfce4"
$ xprop -root _DT_SAVE_MODE | grep ' = \"xfce\"$'       
$

I think we can use simpler expression to detect it that doesn't depend on grep and works for me.

@copiousfreetime copiousfreetime merged commit 5aa595a into from
@jsonn jsonn referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@jsonn jsonn referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@jsonn jsonn referenced this pull request from a commit in jsonn/pkgsrc
taca Update ruby-launchy to 2.2.0.
= Launchy Changlog
== Version 2.2.0 - 2013-02-06

* Change XFCE detection to not depend on grep (copiousfreetime/launchy#52 -
  thanks bogdan)
* Suppress forked process output (copiousfreetime/launchy#51)
* Display help/usage if no url is given (copiousfreetime/launchy#54)
* Detect the fluxbox environment (copiousfreetime/launchy#53)
* Automatically detect 'http' url's if they are missing the 'http://'
  (copiousfreetime/launchy#55)
* Update to latest project management rake tasks
9b74e30
@jperkin jperkin referenced this pull request from a commit in joyent/pkgsrc
taca Update ruby-launchy to 2.2.0.
= Launchy Changlog
== Version 2.2.0 - 2013-02-06

* Change XFCE detection to not depend on grep (copiousfreetime/launchy#52 -
  thanks bogdan)
* Suppress forked process output (copiousfreetime/launchy#51)
* Display help/usage if no url is given (copiousfreetime/launchy#54)
* Detect the fluxbox environment (copiousfreetime/launchy#53)
* Automatically detect 'http' url's if they are missing the 'http://'
  (copiousfreetime/launchy#55)
* Update to latest project management rake tasks
d7e7833
@jperkin jperkin referenced this pull request from a commit in joyent/pkgsrc
taca Update ruby-launchy to 2.2.0.
= Launchy Changlog
== Version 2.2.0 - 2013-02-06

* Change XFCE detection to not depend on grep (copiousfreetime/launchy#52 -
  thanks bogdan)
* Suppress forked process output (copiousfreetime/launchy#51)
* Display help/usage if no url is given (copiousfreetime/launchy#54)
* Detect the fluxbox environment (copiousfreetime/launchy#53)
* Automatically detect 'http' url's if they are missing the 'http://'
  (copiousfreetime/launchy#55)
* Update to latest project management rake tasks
f4ba8d4
@jsonn jsonn referenced this pull request from a commit in jsonn/pkgsrc
taca Update ruby-launchy to 2.2.0.
= Launchy Changlog
== Version 2.2.0 - 2013-02-06

* Change XFCE detection to not depend on grep (copiousfreetime/launchy#52 -
  thanks bogdan)
* Suppress forked process output (copiousfreetime/launchy#51)
* Display help/usage if no url is given (copiousfreetime/launchy#54)
* Detect the fluxbox environment (copiousfreetime/launchy#53)
* Automatically detect 'http' url's if they are missing the 'http://'
  (copiousfreetime/launchy#55)
* Update to latest project management rake tasks
1c1f2a9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 13, 2012
  1. @bogdan
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/launchy/detect/nix_desktop_environment.rb
View
2  lib/launchy/detect/nix_desktop_environment.rb
@@ -49,7 +49,7 @@ def self.browser
class Xfce < NixDesktopEnvironment
def self.is_current_desktop_environment?
if Launchy::Application.find_executable( 'xprop' ) then
- %x[ xprop -root _DT_SAVE_MODE | grep ' = \"xfce\"$' ].strip.size > 0
+ %x[ xprop -root _DT_SAVE_MODE].include?("xfce")
else
false
end
Something went wrong with that request. Please try again.