Attachment 885147 Details for Bug 1086122 – Updated patch 9 for xdg-utils

[patch] Updated patch 9 for xdg-utils

0009-xdg-open-Expand-i-and-c-from-Exec.patch (text/plain), 2.44 KB, created by Till Maas on 2014-04-10 21:12:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Till Maas

Created: 2014-04-10 21:12:06 UTC

Size: 2.44 KB

patch

obsolete

>diff -up xdg-utils-1.1.0-rc2/scripts/xdg-open.in.0009 xdg-utils-1.1.0-rc2/scripts/xdg-open.in
>--- xdg-utils-1.1.0-rc2/scripts/xdg-open.in.0009	2014-04-10 22:57:44.705773986 +0200
>+++ xdg-utils-1.1.0-rc2/scripts/xdg-open.in	2014-04-10 23:08:26.515835514 +0200
>@@ -36,6 +36,38 @@ last_word()
>     echo "$rest"
> }
> 
>+# Get the value of a key in a desktop file's Desktop Entry group.
>+# Example: Use get_key foo.desktop Exec
>+# to get the values of the Exec= key for the Desktop Entry group.
>+get_key()
>+{
>+    local file="${1}"
>+    local key="${2}"
>+    local desktop_entry=""
>+
>+    IFS_="${IFS}"
>+    IFS=""
>+    while read line
>+    do
>+        case "$line" in
>+            "[Desktop Entry]")
>+                desktop_entry="y"
>+            ;;
>+            # Reset match flag for other groups
>+            [*)
>+                desktop_entry=""
>+            ;;
>+            *)
>+                # Only match Desktop Entry group
>+                if [ -n "${desktop_entry}" ]
>+                then
>+                    echo "${line}" | grep -E "^${key}=" "${file}" | cut -d= -f 2-
>+                fi
>+        esac
>+    done < "${file}"
>+    IFS="${IFS_}" 
>+}
>+
> open_darwin()
> {
>     open "$1"
>@@ -137,11 +169,23 @@ search_desktop_file()
>     fi
> 
>     if [ -r "$file" ] ; then
>-        command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`"
>+        command="$(get_key "${file}" "Exec" | first_word)"
>         command_exec=`which $command 2>/dev/null`
>-        arguments="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | last_word`"
>+        arguments="$(get_key "${file}" "Exec" | last_word)"
>         arg_one="`echo "$arg" | sed 's/[&*\\]/\\\\&/g'`"
>-        arguments_exec="`echo "$arguments" | sed -e 's*%[fFuU]*"'"$arg_one"'"*g'`"
>+        icon="$(get_key "${file}" "Icon")"
>+        if [ "${icon}" != "" ]
>+        then
>+            icon="--icon '${icon}'"
>+        else
>+            icon="''"
>+        fi
>+        # FIXME: Actually LC_MESSAGES should be used as described in
>+        # http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s04.html
>+        localised_name="'$(get_key "${file}" "Name")'"
>+        arguments_exec="$(echo "$arguments" | sed -e 's*%[fFuU]*"'"$arg_one"'"*g' \
>+                                                  -e 's*%i*'"$icon"'*g' \
>+                                                  -e 's*%c*'"$localised_name"'*g')"
> 
>         if [ -x "$command_exec" ] ; then
>             if echo "$arguments" | grep -iq '%[fFuU]' ; then

Actions: View | Diff

Attachments on bug 1086122: 885132 | 885147 | 886351