Kaydet (Commit) cf4a55dd authored tarafından Petr Mladek's avatar Petr Mladek

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.
üst bcbf10e7
...@@ -121,13 +121,9 @@ fi ...@@ -121,13 +121,9 @@ fi
for subdir in `cd ${link_target_root}; ls -d *` for subdir in `cd ${link_target_root}; ls -d *`
do do
link_dir="%{gnome_dir}/share/icons/%{gnome_mime_theme}/$subdir/mimetypes" link_dir="%{gnome_dir}/share/icons/%{gnome_mime_theme}/$subdir/mimetypes"
link_target_dir="../../../gnome/$subdir/mimetypes/"
if [ ! -d "${link_dir}" ] test -d "${link_dir}" || mkdir -p "${link_dir}"
then
mkdir -p "${link_dir}"
link_target_dir="../../../gnome/$subdir/mimetypes/"
fi
test -d ${link_dir}/${link_target_dir} || continue 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 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
......
...@@ -82,13 +82,9 @@ fi ...@@ -82,13 +82,9 @@ fi
for subdir in `cd ${link_target_root}; ls -d *` for subdir in `cd ${link_target_root}; ls -d *`
do do
link_dir="%{gnome_dir}/share/icons/%{gnome_mime_theme}/$subdir/mimetypes" link_dir="%{gnome_dir}/share/icons/%{gnome_mime_theme}/$subdir/mimetypes"
link_target_dir="../../../gnome/$subdir/mimetypes/"
if [ ! -d "${link_dir}" ] test -d "${link_dir}" || mkdir -p "${link_dir}"
then
mkdir -p "${link_dir}"
link_target_dir="../../../gnome/$subdir/mimetypes/"
fi
test -d ${link_dir}/${link_target_dir} || continue 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 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
......
...@@ -91,13 +91,9 @@ fi ...@@ -91,13 +91,9 @@ fi
for subdir in `cd ${link_target_root}; ls -d *` for subdir in `cd ${link_target_root}; ls -d *`
do do
link_dir="%{gnome_dir}/share/icons/%{gnome_mime_theme}/$subdir/mimetypes" link_dir="%{gnome_dir}/share/icons/%{gnome_mime_theme}/$subdir/mimetypes"
link_target_dir="../../../gnome/$subdir/mimetypes/"
if [ ! -d "${link_dir}" ] test -d "${link_dir}" || mkdir -p "${link_dir}"
then
mkdir -p "${link_dir}"
link_target_dir="../../../gnome/$subdir/mimetypes/"
fi
test -d ${link_dir}/${link_target_dir} || continue 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 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment