diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-06-14 15:12:59 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-06-14 15:12:59 +0200 |
| commit | cf4a55dd662a0ae284a1b7923cfeb5d2652a032b (patch) | |
| tree | 2db7189a4f4f645e308e4339542944d80aa446a8 /sysui | |
| parent | bcbf10e723120aef2a049c4c8164a0443f84c78d (diff) | |
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.
Diffstat (limited to 'sysui')
| -rwxr-xr-x | sysui/desktop/freedesktop/freedesktop-menus.spec | 8 | ||||
| -rwxr-xr-x | sysui/desktop/redhat/redhat-menus.spec | 8 | ||||
| -rwxr-xr-x | 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 2472f5e862cf..7cb6370f2837 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 5b0ac015bebf..933a3ae2c71c 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 |