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

Side by Side Diff: scripts/xdg-icon-resource

Issue 7000007: Upstream adjusted my patch to xdg-utils a little before committing it. Merge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/xdg-utils/
Patch Set: '' Created 9 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « scripts/xdg-email ('k') | scripts/xdg-mime » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 #--------------------------------------------- 2 #---------------------------------------------
3 # xdg-icon-resource 3 # xdg-icon-resource
4 # 4 #
5 # Utility script to install icons on a Linux desktop. 5 # Utility script to install icons on a Linux desktop.
6 # 6 #
7 # Refer to the usage() function below for usage. 7 # Refer to the usage() function below for usage.
8 # 8 #
9 # Copyright 2009-2010, Fathi Boudra <fabo@freedesktop.org> 9 # Copyright 2009-2010, Fathi Boudra <fabo@freedesktop.org>
10 # Copyright 2009-2010, Rex Dieter <rdieter@fedoraproject.org> 10 # Copyright 2009-2010, Rex Dieter <rdieter@fedoraproject.org>
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 case "$(uname 2>/dev/null)" in 484 case "$(uname 2>/dev/null)" in
485 Darwin) 485 Darwin)
486 DE=darwin; 486 DE=darwin;
487 ;; 487 ;;
488 esac 488 esac
489 fi 489 fi
490 490
491 if [ x"$DE" = x"gnome" ]; then 491 if [ x"$DE" = x"gnome" ]; then
492 # gnome-default-applications-properties is only available in GNOME 2.x 492 # gnome-default-applications-properties is only available in GNOME 2.x
493 # but not in GNOME 3.x 493 # but not in GNOME 3.x
494 which gnome-default-applications-properties > /dev/null 2> /dev/null || DE ="gnome3" 494 which gnome-default-applications-properties > /dev/null 2>&1 || DE="gnome 3"
495 fi 495 fi
496 } 496 }
497 497
498 #---------------------------------------------------------------------------- 498 #----------------------------------------------------------------------------
499 # kfmclient exec/openURL can give bogus exit value in KDE <= 3.5.4 499 # kfmclient exec/openURL can give bogus exit value in KDE <= 3.5.4
500 # It also always returns 1 in KDE 3.4 and earlier 500 # It also always returns 1 in KDE 3.4 and earlier
501 # Simply return 0 in such case 501 # Simply return 0 in such case
502 502
503 kfmclient_fix_exit_code() 503 kfmclient_fix_exit_code()
504 { 504 {
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 if [ x"$update" = x"yes" ] ; then 924 if [ x"$update" = x"yes" ] ; then
925 update_icon_database "$xdg_base_dir" 925 update_icon_database "$xdg_base_dir"
926 if [ -n "$dot_icon_dir" ] ; then 926 if [ -n "$dot_icon_dir" ] ; then
927 if [ -d "$dot_icon_dir/" -a ! -L "$dot_icon_dir" ] ; then 927 if [ -d "$dot_icon_dir/" -a ! -L "$dot_icon_dir" ] ; then
928 update_icon_database $dot_base_dir 928 update_icon_database $dot_base_dir
929 fi 929 fi
930 fi 930 fi
931 fi 931 fi
932 932
933 exit_success 933 exit_success
OLDNEW
« no previous file with comments | « scripts/xdg-email ('k') | scripts/xdg-mime » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698