Fix sed(1) usage to open the proper application according to its mime

type.

breakage reported by edd@, fixed by sthen@
This commit is contained in:
ajacoutot 2013-01-04 11:42:18 +00:00
parent b08e702360
commit 7281e1c290
2 changed files with 16 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2012/10/18 13:17:36 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2013/01/04 11:42:18 ajacoutot Exp $
# Does _not_ depend on desktop-file-utils, hicolor-icon-theme,
# gtk-update-icon-cache, shared-mime-info... on purpose as it should
@ -8,7 +8,7 @@ COMMENT= utilities to assist desktop integration tasks
DISTNAME= xdg-utils-1.1.0-rc1
PKGNAME= xdg-utils-1.1.0rc1
REVISION= 1
REVISION= 2
CATEGORIES= devel

View File

@ -1,7 +1,18 @@
$OpenBSD: patch-scripts_xdg-open,v 1.7 2012/04/09 09:39:15 ajacoutot Exp $
$OpenBSD: patch-scripts_xdg-open,v 1.8 2013/01/04 11:42:18 ajacoutot Exp $
Fix sed(1) usage (i.e. !GNU sed).
--- scripts/xdg-open.orig Sat Jan 1 11:03:14 2011
+++ scripts/xdg-open Mon Apr 9 11:13:15 2012
@@ -391,7 +391,7 @@ open_generic_xdg_mime()
+++ scripts/xdg-open Fri Jan 4 12:33:10 2013
@@ -384,14 +384,14 @@ open_xfce()
open_generic_xdg_mime()
{
- filetype=`xdg-mime query filetype "$1" | sed "s/;.*//"`
+ filetype=`xdg-mime query filetype "$1" | sed "s/[ ;].*//"`
default=`xdg-mime query default "$filetype"`
if [ -n "$default" ] ; then
xdg_user_dir="$XDG_DATA_HOME"
[ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
xdg_system_dirs="$XDG_DATA_DIRS"