Attachment 54838 Details for Bug 44163 – Possible fix

[patch] Possible fix

make_xdg-open_parse_mimeapps_lists_properly.patch (text/plain), 1.95 KB, created by Stephan Sokolow on 2011-12-26 20:33:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Sokolow

Created: 2011-12-26 20:33:15 UTC

Size: 1.95 KB

patch

obsolete

>diff --git a/scripts/xdg-open b/scripts/xdg-open
>index fee4204..b9ed3a1 100755
>--- a/scripts/xdg-open
>+++ b/scripts/xdg-open
>@@ -386,25 +386,31 @@ open_xfce()
> open_generic_xdg_mime()
> {
>     filetype=`xdg-mime query filetype "$1" | sed "s/;.*//"`
>-    default=`xdg-mime query default "$filetype"`
>-    if [ -n "$default" ] ; then
>+    defaults=`xdg-mime query default "$filetype"`
>+    if [ -n "$defaults" ] ; then
>         xdg_user_dir="$XDG_DATA_HOME"
>         [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
> 
>         xdg_system_dirs="$XDG_DATA_DIRS"
>         [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
> 
>-        for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
>-            local file="$x/applications/$default"
>-            if [ -r "$file" ] ; then
>-                command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`"
>-                command_exec=`which $command 2>/dev/null`
>-                if [ -x "$command_exec" ] ; then
>-                    $command_exec "$1"
>-                    if [ $? -eq 0 ]; then
>-                        exit_success
>+        IFS=";"
>+        for default in $defaults; do
>+            if [ x"$default" != x"" ]; then
>+                unset IFS
>+                for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
>+                    local file="$x/applications/$default"
>+                    if [ -r "$file" ] ; then
>+                        command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`"
>+                        command_exec=`which $command 2>/dev/null`
>+                        if [ -x "$command_exec" ] ; then
>+                            $command_exec "$1"
>+                            if [ $? -eq 0 ]; then
>+                                exit_success
>+                            fi
>+                        fi
>                     fi
>-                fi
>+                done
>             fi
>         done
>     fi

Actions: View | Splinter Review

Attachments on bug 44163: 54838 | 124299 | 124300 | 127887 | 134577

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.