Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: third_party/xdg-utils/scripts/xdg-mime.in

Issue 6737007: Update xdg-utils to the latest version available in git. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/xdg-utils/scripts/xdg-mime ('k') | third_party/xdg-utils/scripts/xdg-open » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/xdg-utils/scripts/xdg-mime.in
===================================================================
--- third_party/xdg-utils/scripts/xdg-mime.in (revision 79909)
+++ third_party/xdg-utils/scripts/xdg-mime.in (working copy)
@@ -73,14 +73,17 @@
info_gnome()
{
- file=`readlink -f "$1"` # Normalize path
-
if gvfs-info --help 2>/dev/null 1>&2; then
- DEBUG 1 "Running gvfs-info \"$file\""
- gvfs-info "$file" 2> /dev/null | grep standard::content-type | cut -d' ' -f4
+ DEBUG 1 "Running gvfs-info \"$1\""
+ gvfs-info "$1" 2> /dev/null | grep standard::content-type | cut -d' ' -f4
+ elif gnomevfs-info --help 2>/dev/null 1>&2; then
+ DEBUG 1 "Running gnomevfs-info \"$1\""
+ gnomevfs-info --slow-mime "$1" 2> /dev/null | grep "^MIME" | cut -d ":" -f 2 | sed s/"^ "//
else
- DEBUG 1 "Running gnomevfs-info \"$file\""
- gnomevfs-info --slow-mime "$file" 2> /dev/null | grep "^MIME" | cut -d ":" -f 2 | sed s/"^ "//
+ # according to https://bugs.freedesktop.org/show_bug.cgi?id=33094#c5
+ # neither gvfs-info or gnomevfs-info are present in a default Ubuntu Natty
+ # install, so fallback to info_generic
+ info_generic "$1"
fi
if [ $? -eq 0 ]; then
@@ -92,8 +95,13 @@
info_generic()
{
- DEBUG 1 "Running file -i \"$1\""
- /usr/bin/file -i "$1" 2> /dev/null | cut -d ":" -f 2 | sed s/"^ "//
+ if mimetype --version >/dev/null 2>&1; then
+ DEBUG 1 "Running mimetype -b \"$1\""
+ mimetype -b "$1"
+ else
+ DEBUG 1 "Running file -i \"$1\""
+ /usr/bin/file -i "$1" 2> /dev/null | cut -d ":" -f 2 | sed s/"^ "//
+ fi
if [ $? -eq 0 ]; then
exit_success
@@ -329,6 +337,7 @@
;;
esac
check_input_file "$filename"
+ filename=`readlink -f -- "$filename"`
;;
default)
@@ -422,7 +431,7 @@
info_kde "$filename"
;;
- gnome)
+ gnome*)
info_gnome "$filename"
;;
« no previous file with comments | « third_party/xdg-utils/scripts/xdg-mime ('k') | third_party/xdg-utils/scripts/xdg-open » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698