← Back to branch summary

~ubuntu-branches/ubuntu/wily/xdg-utils/wily

« back to all changes in this revision

Viewing changes to .pc/xdg-mime-generic-use-mimetype.diff/scripts/xdg-mime

  • Committer: Bazaar Package Importer
  • Author(s): Per Olofsson
  • Date: 2011-02-20 18:34:53 UTC
  • Revision ID: james.westby@ubuntu.com-20110220183453-7p0edr23dygfhseg
Tags: 1.1.0~rc1-2
http://bugs.debian.org/612339
http://bugs.debian.org/613272
* Tag patches with upstream bug URLs.
* Add patch xdg-mime-follow-symlinks.diff: Follow symlinks when
  querying MIME type in xdg-mime.
* Add patch xdg-open-browser-multiword.diff: Fix support for multi-word
  $BROWSER commands. Closes: #612339.
* Add patch xdg-open-printf.diff: Use /usr/bin/printf if available when
  decoding URLs. dash's printf doesn't understand \xHH
  sequences. Closes: #613272.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/xdg-mime-generic-use-mimetype.diff/scripts/xdg-mime
495
495
 
496
496
info_gnome()
497
497
{
498
 
    file=`readlink -f "$1"` # Normalize path
499
 
 
500
498
    if gvfs-info --help 2>/dev/null 1>&2; then
501
 
        DEBUG 1 "Running gvfs-info \"$file\""
502
 
        gvfs-info "$file" 2> /dev/null | grep standard::content-type | cut -d' ' -f4
 
499
        DEBUG 1 "Running gvfs-info \"$1\""
 
500
        gvfs-info "$1" 2> /dev/null | grep standard::content-type | cut -d' ' -f4
503
501
    else
504
 
       DEBUG 1 "Running gnomevfs-info \"$file\""
505
 
       gnomevfs-info --slow-mime "$file" 2> /dev/null | grep "^MIME" | cut -d ":" -f 2 | sed s/"^ "//
 
502
       DEBUG 1 "Running gnomevfs-info \"$1\""
 
503
       gnomevfs-info --slow-mime "$1" 2> /dev/null | grep "^MIME" | cut -d ":" -f 2 | sed s/"^ "//
506
504
    fi
507
505
 
508
506
    if [ $? -eq 0 ]; then
751
749
            ;;
752
750
        esac
753
751
        check_input_file "$filename"
 
752
        filename=$(readlink -f -- "$filename")
754
753
        ;;
755
754
 
756
755
      default)