summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRex Dieter <rdieter@gmail.com>2018-05-10 09:49:27 -0500
committerRex Dieter <rdieter@gmail.com>2018-05-10 09:49:27 -0500
commit9cb017ae0eaa80c595445e083b2ea7c58569bf12 (patch)
treefcf5559ddffcbe6b6744dc0e852c0a42f0b8709d
parent207d8b39f9b3a73a8dc1b08cf0013a1b5a2702c3 (diff)
xdg-open: use pcmanfm only if it is available (BR106161)
Please enter the commit message for your changes. Lines starting
-rw-r--r--ChangeLog1
-rw-r--r--scripts/xdg-open.in3
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d6feed..c9eaeea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
2018-05-10
* xdg-open: Add Deepin Desktop Environment support (BR106143)
+ * xdg-open: use pcmanfm only if it is available (BR106161)
2018-05-09
* xdg-open: Argument injection in xdg-open open_envvar (BR103807)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index 82f9582..630e63e 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -449,8 +449,9 @@ open_generic()
open_lxde()
{
+
# pcmanfm only knows how to handle file:// urls and filepaths, it seems.
- if is_file_url_or_path "$1"; then
+ if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then
local file="$(file_url_to_path "$1")"
# handle relative paths