[Xfce4-commits] <xfce-utils:master> Don't set /usr/share twice in XDG_DATA_DIRS (bug #5151).

Nick Schermer noreply at xfce.org
Mon Jul 26 20:42:04 CEST 2010


Updating branch refs/heads/master
         to ca88f2d250c35493daa4a600ddcff02bde058674 (commit)
       from 7fdb70fc2da783572ef02a8eb608e1147d2ef2a6 (commit)

commit ca88f2d250c35493daa4a600ddcff02bde058674
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jul 26 20:20:34 2010 +0200

    Don't set /usr/share twice in XDG_DATA_DIRS (bug #5151).

 scripts/startxfce4.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in
index f4a11d4..ecb5e7d 100644
--- a/scripts/startxfce4.in
+++ b/scripts/startxfce4.in
@@ -28,7 +28,7 @@ fi
 
 if test "x$XDG_DATA_DIRS" = "x"
 then
-  if test "x at _datadir_@" = "x/usr/local/share"; then
+  if test "x at _datadir_@" = "x/usr/local/share" -o "x at _datadir_@" = "x/usr/share"; then
     XDG_DATA_DIRS="/usr/local/share:/usr/share"
   else
     XDG_DATA_DIRS="@_datadir_@:/usr/local/share:/usr/share"



More information about the Xfce4-commits mailing list