From 931e3765f5051aa1ae8926db34d13a2f434b38ef Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Tue, 14 Jun 2011 15:12:59 +0200
Subject: always get GNOME MIME type icons from the gnome subdir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sysui/desktop/share/create_tree.sh put the GNOME icons under
the gnome subdir and KDE icons under the hicolor and lolor dirs.
GNOME and KDE root dir is the same (/usr) on RedHat and FreeDesktop.
It is different (/opt vs. /usr) on SUSE. The directory
/opt/gnome/*/hicolor is available on SUSE but the LO icons
are installed only under the gnome subdir.

Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
---
 sysui/desktop/freedesktop/freedesktop-menus.spec | 8 ++------
 sysui/desktop/redhat/redhat-menus.spec           | 8 ++------
 sysui/desktop/suse/suse-menus.spec               | 8 ++------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index c967bf8e2e3e..ba4b68d90a1d 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -121,13 +121,9 @@ fi
 for subdir in `cd ${link_target_root}; ls -d *`
 do
   link_dir="%{gnome_dir}/share/icons/%{gnome_mime_theme}/$subdir/mimetypes"
+  link_target_dir="../../../gnome/$subdir/mimetypes/"
 
-  if [ ! -d "${link_dir}" ]
-  then
-    mkdir -p "${link_dir}"
-    link_target_dir="../../../gnome/$subdir/mimetypes/"
-  fi
-
+  test -d "${link_dir}" || mkdir -p "${link_dir}"
   test -d ${link_dir}/${link_target_dir} || continue
 
   icon=${link_target_dir}%iconprefix-drawing.png;                     test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.sun.xml.draw.png
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index 53644a980d5d..aa7249793537 100755
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -82,13 +82,9 @@ fi
 for subdir in `cd ${link_target_root}; ls -d *`
 do
   link_dir="%{gnome_dir}/share/icons/%{gnome_mime_theme}/$subdir/mimetypes"
+  link_target_dir="../../../gnome/$subdir/mimetypes/"
 
-  if [ ! -d "${link_dir}" ]
-  then
-    mkdir -p "${link_dir}"
-    link_target_dir="../../../gnome/$subdir/mimetypes/"
-  fi
-
+  test -d "${link_dir}" || mkdir -p "${link_dir}"
   test -d ${link_dir}/${link_target_dir} || continue
 
   icon=${link_target_dir}%iconprefix-drawing.png;                     test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.sun.xml.draw.png
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index 7354c49543fe..37806153aa31 100755
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -91,13 +91,9 @@ fi
 for subdir in `cd ${link_target_root}; ls -d *`
 do
   link_dir="%{gnome_dir}/share/icons/%{gnome_mime_theme}/$subdir/mimetypes"
+  link_target_dir="../../../gnome/$subdir/mimetypes/"
 
-  if [ ! -d "${link_dir}" ]
-  then
-    mkdir -p "${link_dir}"
-    link_target_dir="../../../gnome/$subdir/mimetypes/"
-  fi
-
+  test -d "${link_dir}" || mkdir -p "${link_dir}"
   test -d ${link_dir}/${link_target_dir} || continue
 
   icon=${link_target_dir}%iconprefix-drawing.png;                     test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.sun.xml.draw.png
-- 
cgit