40 lines
1.4 KiB
Plaintext
40 lines
1.4 KiB
Plaintext
$OpenBSD: patch-scripts_xdg-open_in,v 1.6 2019/01/30 06:11:18 ajacoutot Exp $
|
|
|
|
Fix sed(1) usage (i.e. !GNU sed).
|
|
|
|
From 31525d3855f876ddf2e29091b2e8d376f923e09e Mon Sep 17 00:00:00 2001
|
|
From: Rex Dieter <rdieter@gmail.com>
|
|
Date: Thu, 24 May 2018 14:40:53 -0500
|
|
Subject: xdg-open: better pcmanfm check (BR106636,BR106161)
|
|
|
|
Index: scripts/xdg-open.in
|
|
--- scripts/xdg-open.in.orig
|
|
+++ scripts/xdg-open.in
|
|
@@ -353,7 +353,7 @@ DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"
|
|
|
|
open_generic_xdg_file_mime()
|
|
{
|
|
- filetype=`xdg-mime query filetype "$1" | sed "s/;.*//"`
|
|
+ filetype=`xdg-mime query filetype "$1" | sed "s/[ ;].*//"`
|
|
open_generic_xdg_mime "$1" "$filetype"
|
|
}
|
|
|
|
@@ -438,7 +438,7 @@ open_generic()
|
|
if [ x"$BROWSER" = x"" ]; then
|
|
BROWSER=www-browser:links2:elinks:links:lynx:w3m
|
|
if has_display; then
|
|
- BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium:chromium-browser:google-chrome:$BROWSER
|
|
+ BROWSER=x-www-browser:firefox:chrome:iceweasel:seamonkey:mozilla:epiphany:midori:konqueror:chromium-browser:google-chrome:$BROWSER
|
|
fi
|
|
fi
|
|
|
|
@@ -451,7 +451,7 @@ open_lxde()
|
|
{
|
|
|
|
# pcmanfm only knows how to handle file:// urls and filepaths, it seems.
|
|
- if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then
|
|
+ if pcmanfm --help >/dev/null 2>&1 && is_file_url_or_path "$1"; then
|
|
local file="$(file_url_to_path "$1")"
|
|
|
|
# handle relative paths
|