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

Side by Side Diff: scripts/xdg-desktop-icon.in

Issue 6928018: Linux: update xdg-utils to the latest git version and include a one-line fix in xdg-mime. (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-desktop-icon ('k') | scripts/xdg-desktop-menu » ('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-icon 3 # xdg-desktop-icon
4 # 4 #
5 # Utility script to install desktop items on a Linux desktop. 5 # Utility script to install desktop items 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 [ -w "$desktop_dir" ] || desktop_dir= 110 [ -w "$desktop_dir" ] || desktop_dir=
111 fi 111 fi
112 if [ -n "$desktop_dir_kde" ]; then 112 if [ -n "$desktop_dir_kde" ]; then
113 if [ ! -d "$desktop_dir_kde" ]; then 113 if [ ! -d "$desktop_dir_kde" ]; then
114 save_umask=`umask` 114 save_umask=`umask`
115 umask $my_umask 115 umask $my_umask
116 mkdir -p "$desktop_dir_kde" 116 mkdir -p "$desktop_dir_kde"
117 umask $save_umask 117 umask $save_umask
118 fi 118 fi
119 # Is the KDE desktop dir != $HOME/Desktop ? 119 # Is the KDE desktop dir != $HOME/Desktop ?
120 if [ x`readlink -f "$desktop_dir"` != x`readlink -f "$desktop_dir_kde"` ]; t hen 120 if [ "x`readlink -f "$desktop_dir"`" != "x`readlink -f "$desktop_dir_kde"`" ]; then
121 # If so, don't create $HOME/Desktop if it doesn't exist 121 # If so, don't create $HOME/Desktop if it doesn't exist
122 [ -w "$desktop_dir" ] || desktop_dir= 122 [ -w "$desktop_dir" ] || desktop_dir=
123 else 123 else
124 desktop_dir_kde= 124 desktop_dir_kde=
125 fi 125 fi
126 fi 126 fi
127 127
128 basefile=`basename "$desktop_file"` 128 basefile=`basename "$desktop_file"`
129 129
130 DEBUG 1 "$action $desktop_file in $desktop_dir $desktop_dir_kde $desktop_dir_gno me" 130 DEBUG 1 "$action $desktop_file in $desktop_dir $desktop_dir_kde $desktop_dir_gno me"
(...skipping 20 matching lines...) Expand all
151 rm -f "$x/$basefile" 151 rm -f "$x/$basefile"
152 fi 152 fi
153 done 153 done
154 154
155 ;; 155 ;;
156 esac 156 esac
157 157
158 exit_success 158 exit_success
159 159
160 160
OLDNEW
« no previous file with comments | « scripts/xdg-desktop-icon ('k') | scripts/xdg-desktop-menu » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698