Linux: update xdg-utils to the latest git version and include a one-line fix in xdg-mime.

scripts/xdg-settings

 #!/bin/sh
 #---------------------------------------------
 #   xdg-settings
 #
 #   Utility script to get various settings from the desktop environment.
 #
 #   Refer to the usage() function below for usage.
 #
 #   Copyright 2009, Google Inc.
 #
@@ skipping 111 matching lines @@
 #----------------------------------------------------------------------------
 
 DEBUG()
 {
   [ -z "${XDG_UTILS_DEBUG_LEVEL}" ] && return 0;
   [ ${XDG_UTILS_DEBUG_LEVEL} -lt $1 ] && return 0;
   shift
   echo "$@" >&2
 }
 
+# This handles backslashes but not quote marks.
+first_word()
+{
+    read first rest
+    echo "$first"
+}
+
+#-------------------------------------------------------------
+# map a binary to a .desktop file
+binary_to_desktop_file()
+{
+    search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
+    binary="`which "$1"`"
+    binary="`readlink -f "$binary"`"
+    base="`basename "$binary"`"
+    IFS=:
+    for dir in $search; do
+        unset IFS
+        [ "$dir" ] || continue
+        [ -d "$dir/applications" -o -d "$dir/applnk" ] || continue
+        for file in "$dir"/applications/*.desktop "$dir"/applications/*/*.desktop "$dir"/applnk/*.desktop "$dir"/applnk/*/*.desktop; do
+            [ -r "$file" ] || continue
+            # Check to make sure it's worth the processing.
+            grep -q "^Exec.*$base" "$file" || continue
+            # Make sure it's a visible desktop file (e.g. not "preferred-web-browser.desktop").
+            grep -Eq "^(NoDisplay|Hidden)=true" "$file" && continue
+            command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`"
+            command="`which "$command"`"
+            if [ x"`readlink -f "$command"`" = x"$binary" ]; then
+                # Fix any double slashes that got added path composition
+                echo "$file" | sed -e 's,//*,/,g'
+                return
+            fi
+        done
+    done
+}
+
+#-------------------------------------------------------------
+# 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}"
+    desktop="`basename "$1"`"
+    IFS=:
+    for dir in $search; do
+        unset IFS
+        [ "$dir" -a -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
+    done
+}
+
 #-------------------------------------------------------------
 # Exit script on successfully completing the desired operation
 
 exit_success()
 {
     if [ $# -gt 0 ]; then
         echo "$@"
         echo
     fi
 
@@ skipping 238 matching lines @@
         ;;
       *)
         exit_failure_syntax "invalid application name"
         ;;
     esac
 }
 
 # {{{ default browser
 # {{{ utility functions
 
-# This handles backslashes but not quote marks.
-first_word()
-{
-    read first rest
-    echo "$first"
-}
-
-binary_to_desktop_file()
-{
-    search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
-    binary="`which "$1"`"
-    binary="`readlink -f "$binary"`"
-    base="`basename "$binary"`"
-    IFS=:
-    for dir in $search; do
-        unset IFS
-        [ "$dir" ] || continue
-        [ -d "$dir/applications" -o -d "$dir/applnk" ] || continue
-        for file in "$dir"/applications/*.desktop "$dir"/applnk/*.desktop; do
-            [ -r "$file" ] || continue
-            # Check to make sure it's worth the processing.
-            grep -q "^Exec.*$base" "$file" || continue
-            # Make sure it's a visible desktop file (e.g. not "preferred-web-browser.desktop").
-            grep -Eq "^(NoDisplay|Hidden)=true" "$file" && continue
-            command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`"
-            command="`which "$command"`"
-            if [ x"`readlink -f "$command"`" = x"$binary" ]; then
-                # Fix any double slashes that got added path composition
-                echo "$file" | sed -e 's,//*,/,g'
-                return
-            fi
-        done
-    done
-}
-
-desktop_file_to_binary()
-{
-    search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
-    desktop="`basename "$1"`"
-    IFS=:
-    for dir in $search; do
-        unset IFS
-        [ "$dir" -a -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
-    done
-}
-
 # In order to remove an application from the automatically-generated list of
 # applications for handling a given MIME type, the desktop environment may copy
 # the global .desktop file into the user's .local directory, and remove that
 # MIME type from its list. In that case, we must restore the MIME type to the
 # application's list of MIME types before we can set it as the default for that
 # MIME type. (We can't just delete the local version, since the user may have
 # made other changes to it as well. So, tweak the existing file.)
 # This function is hard-coded for text/html but it could be adapted if needed.
 fix_local_desktop_file()
 {
@@ skipping 498 matching lines @@
     ;;
 
     generic)
     dispatch_generic "$@"
     ;;
 
     *)
     exit_failure_operation_impossible "unknown desktop environment"
     ;;
 esac