[Libreoffice-commits] .: sysui/desktop

[Petr Mladek]

 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(-)

New commits:
commit ddf4f601060d2140165b16c13cac515eda27d7d8
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jun 14 15:12:59 2011 +0200

    always get GNOME MIME type icons from the gnome subdir
    
    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.

diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index c967bf8..ba4b68d 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 2472f5e..7cb6370 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 5b0ac01..933a3ae 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