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

Side by Side Diff: scripts/xdg-desktop-menu

Issue 6825018: Linux: Fix a bug in upstream xdg-utils that breaks xdg-settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/xdg-utils/
Patch Set: Created 9 years, 8 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-desktop-icon ('k') | scripts/xdg-email » ('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-desktop-menu 3 # xdg-desktop-menu
4 # 4 #
5 # Utility script to install menu items on a Linux desktop. 5 # Utility script to install menu items on a Linux desktop.
6 # Refer to the usage() function below for usage. 6 # Refer to the usage() function below for usage.
7 # 7 #
8 # Copyright 2009-2010, Fathi Boudra <fabo@freedesktop.org> 8 # Copyright 2009-2010, Fathi Boudra <fabo@freedesktop.org>
9 # Copyright 2009-2010, Rex Dieter <rdieter@fedoraproject.org> 9 # Copyright 2009-2010, Rex Dieter <rdieter@fedoraproject.org>
10 # Copyright 2006, Kevin Krammer <kevin.krammer@gmx.at> 10 # Copyright 2006, Kevin Krammer <kevin.krammer@gmx.at>
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 case "$(uname 2>/dev/null)" in 623 case "$(uname 2>/dev/null)" in
624 Darwin) 624 Darwin)
625 DE=darwin; 625 DE=darwin;
626 ;; 626 ;;
627 esac 627 esac
628 fi 628 fi
629 629
630 if [ x"$DE" = x"gnome" ]; then 630 if [ x"$DE" = x"gnome" ]; then
631 # gnome-default-applications-properties is only available in GNOME 2.x 631 # gnome-default-applications-properties is only available in GNOME 2.x
632 # but not in GNOME 3.x 632 # but not in GNOME 3.x
633 which gnome-default-applications-properties 2> /dev/null || DE="gnome3" 633 which gnome-default-applications-properties > /dev/null 2> /dev/null || DE ="gnome3"
634 fi 634 fi
635 } 635 }
636 636
637 #---------------------------------------------------------------------------- 637 #----------------------------------------------------------------------------
638 # kfmclient exec/openURL can give bogus exit value in KDE <= 3.5.4 638 # kfmclient exec/openURL can give bogus exit value in KDE <= 3.5.4
639 # It also always returns 1 in KDE 3.4 and earlier 639 # It also always returns 1 in KDE 3.4 and earlier
640 # Simply return 0 in such case 640 # Simply return 0 in such case
641 641
642 kfmclient_fix_exit_code() 642 kfmclient_fix_exit_code()
643 { 643 {
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 1243
1244 ;; 1244 ;;
1245 esac 1245 esac
1246 done 1246 done
1247 1247
1248 if [ x"$update" = x"yes" ] ; then 1248 if [ x"$update" = x"yes" ] ; then
1249 update_desktop_database 1249 update_desktop_database
1250 fi 1250 fi
1251 1251
1252 exit_success 1252 exit_success
OLDNEW
« no previous file with comments | « scripts/xdg-desktop-icon ('k') | scripts/xdg-email » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698