Attachment 127887 Details for Bug 44163 – This patch checks filenames with a - after checking the vendor prefix.

[patch] This patch checks filenames with a - after checking the vendor prefix.

common-vendor-dirs-in-desktop_to_binary.patch (text/plain), 2.30 KB, created by Simon Lees (SUSE) on 2016-11-09 23:52:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Lees (SUSE)

Created: 2016-11-09 23:52:23 UTC

Size: 2.30 KB

patch

obsolete

>commit 6e4d88e740b89a2766312fb544e4a22b7034d9e3
>Author: Simon Lees <sflees@suse.de>
>Date:   Tue May 31 13:13:53 2016 +0930
>
>    common: implement vendor dirs in desktop_file_to_binary
>
>Index: xdg-utils-20160610/scripts/xdg-utils-common.in
>===================================================================
>--- xdg-utils-20160610.orig/scripts/xdg-utils-common.in
>+++ xdg-utils-20160610/scripts/xdg-utils-common.in
>@@ -50,7 +50,6 @@ binary_to_desktop_file()
> 
> #-------------------------------------------------------------
> # map a .desktop file to a binary
>-## FIXME: handle vendor dir case
> desktop_file_to_binary()
> {
>     search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
>@@ -58,14 +57,33 @@ desktop_file_to_binary()
>     IFS=:
>     for dir in $search; do
>         unset IFS
>-        [ "$dir" ] && [ -d "$dir/applications" ] || continue
>-        file="$dir/applications/$desktop"
>-        [ -r "$file" ] || continue
>-        # Remove any arguments (%F, %f, %U, %u, etc.).
>-        command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`"
>-        command="`which "$command"`"
>-        readlink -f "$command"
>-        return
>+        [ "$dir" ] && [ -d "$dir/applications" ] || [ -d "$dir/applnk" ] || continue
>+        # Check if desktop file contains -
>+        if [ "${desktop#*-}" != "$desktop" ]; then
>+            vendor=${desktop%-*}
>+            app=${desktop#*-}
>+            if [ -r $dir/applications/$vendor/$app ]; then
>+                file_path=$dir/applications/$vendor/$app
>+            elif [ -r $dir/applnk/$vendor/$app ]; then
>+                file_path=$dir/applnk/$vendor/$app
>+            fi
>+        fi
>+        if test -z "$file_path" ; then
>+            for indir in "$dir"/applications/ "$dir"/applications/*/ "$dir"/applnk/ "$dir"/applnk/*/; do
>+                file="$indir/$desktop"
>+                if [ -r "$file" ]; then
>+                    file_path=$file
>+                    break
>+                fi
>+            done
>+        fi
>+        if [ -r "$file_path" ]; then
>+            # Remove any arguments (%F, %f, %U, %u, etc.).
>+            command="`grep -E "^Exec(\[[^]=]*])?=" "$file_path" | cut -d= -f 2- | first_word`"
>+            command="`which "$command"`"
>+            readlink -f "$command"
>+            return
>+        fi
>     done
> }
>

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.