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

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

Issue 6881074: Linux: fix a syntax error in the latest version of xdg-utils. Will report it. (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-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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/D Bus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/nul l 2>&1` ; then DE=gnome; 404 elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/D Bus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/nul l 2>&1` ; then DE=gnome;
405 elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/nul l 2>&1; then DE=xfce; 405 elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/nul l 2>&1; then DE=xfce;
406 elif xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2> &1; then DE=xfce 406 elif xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2> &1; then DE=xfce
407 fi 407 fi
408 408
409 if [ x"$DE" = x"" ]; then 409 if [ x"$DE" = x"" ]; then
410 # fallback to checking $DESKTOP_SESSION 410 # fallback to checking $DESKTOP_SESSION
411 case "$DESKTOP_SESSION" in 411 case "$DESKTOP_SESSION" in
412 gnome) 412 gnome)
413 DE=gnome; 413 DE=gnome;
414 ;;
414 LXDE) 415 LXDE)
415 DE=lxde; 416 DE=lxde;
416 ;; 417 ;;
417 xfce|xfce4) 418 xfce|xfce4)
418 DE=xfce; 419 DE=xfce;
419 ;; 420 ;;
420 esac 421 esac
421 fi 422 fi
422 423
423 if [ x"$DE" = x"" ]; then 424 if [ x"$DE" = x"" ]; then
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 if [ x"$update" = x"yes" ] ; then 866 if [ x"$update" = x"yes" ] ; then
866 update_icon_database "$xdg_base_dir" 867 update_icon_database "$xdg_base_dir"
867 if [ -n "$dot_icon_dir" ] ; then 868 if [ -n "$dot_icon_dir" ] ; then
868 if [ -d "$dot_icon_dir/" -a ! -L "$dot_icon_dir" ] ; then 869 if [ -d "$dot_icon_dir/" -a ! -L "$dot_icon_dir" ] ; then
869 update_icon_database $dot_base_dir 870 update_icon_database $dot_base_dir
870 fi 871 fi
871 fi 872 fi
872 fi 873 fi
873 874
874 exit_success 875 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