diff options
| author | Devid Antonio Floni <d.filoni@ubuntu.com> | 2017-06-18 20:00:05 +0300 |
|---|---|---|
| committer | Devid Antonio Floni <d.filoni@ubuntu.com> | 2017-06-18 20:00:05 +0300 |
| commit | 85e3373386ec6c639a97b1045bb5a99cf7847a95 (patch) | |
| tree | 45470a186182f8be53010d9a7b3715304c1010dc /snap | |
| parent | fa8bd2f7ea83319434eb650bcb72323cba3a281c (diff) | |
Revert "snapcraft: override remote desktop-gtk3 part by generating caches"
This reverts commit e1fb2e17ad304232f6d6407899426e8074742651.
Diffstat (limited to 'snap')
| -rw-r--r-- | snap/snapcraft.yaml.in | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/snap/snapcraft.yaml.in b/snap/snapcraft.yaml.in index 3062a408b..5c1a53f73 100644 --- a/snap/snapcraft.yaml.in +++ b/snap/snapcraft.yaml.in @@ -105,6 +105,7 @@ parts: after: - libssh-0.7 - freerdp + - desktop-gtk3 - indicator-gtk3 - snapcraft-preload @@ -116,25 +117,27 @@ parts: - gcc-multilib - g++-multilib - desktop-gtk3: + desktop-integration: + plugin: nil install: | set -x - export XDG_DATA_DIRS=$SNAPCRAFT_PART_INSTALL/usr/share:$XDG_DATA_DIRS - $SNAPCRAFT_PART_INSTALL/usr/bin/update-mime-database $SNAPCRAFT_PART_INSTALL/usr/share/mime - $SNAPCRAFT_PART_INSTALL/usr/bin/gio-querymodules $SNAPCRAFT_PART_INSTALL/usr/lib/*/gio/modules - $SNAPCRAFT_PART_INSTALL/usr/bin/glib-compile-schemas $SNAPCRAFT_PART_INSTALL/usr/share/glib-2.0/schemas + SNAPCRAFT_PRIME=$SNAPCRAFT_STAGE/../prime + export XDG_DATA_DIRS=$SNAPCRAFT_PRIME/usr/share:$XDG_DATA_DIRS + $SNAPCRAFT_STAGE/usr/bin/update-mime-database $SNAPCRAFT_PRIME/usr/share/mime + $SNAPCRAFT_STAGE/usr/bin/gio-querymodules $SNAPCRAFT_PRIME/usr/lib/*/gio/modules + $SNAPCRAFT_STAGE/usr/bin/glib-compile-schemas $SNAPCRAFT_PRIME/usr/share/glib-2.0/schemas - loaders_dir=$(ls -d $SNAPCRAFT_PART_INSTALL/usr/lib/*/gdk-pixbuf-2.0/[0-9]*) + loaders_dir=$(ls -d $SNAPCRAFT_PRIME/usr/lib/*/gdk-pixbuf-2.0/[0-9]*) export GDK_PIXBUF_MODULEDIR=$loaders_dir/loaders - $SNAPCRAFT_PART_INSTALL/usr/lib/*/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders > $loaders_dir/loaders.cache - sed -i s,$SNAPCRAFT_PART_INSTALL,,g $loaders_dir/loaders.cache + $SNAPCRAFT_STAGE/usr/lib/*/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders > $loaders_dir/loaders.cache + sed -i s,$SNAPCRAFT_PRIME,,g $loaders_dir/loaders.cache - for theme_dir in $SNAPCRAFT_PART_INSTALL/usr/share/icons/*; do - if [ -f $SNAPCRAFT_PART_INSTALL/usr/sbin/update-icon-caches ]; then - $SNAPCRAFT_PART_INSTALL/usr/sbin/update-icon-caches "$theme_dir" + for theme_dir in $SNAPCRAFT_PRIME/usr/share/icons/*; do + if [ -f $SNAPCRAFT_STAGE/usr/sbin/update-icon-caches ]; then + $SNAPCRAFT_STAGE/usr/sbin/update-icon-caches "$theme_dir" fi - if [ -f $SNAPCRAFT_PART_INSTALL/usr/sbin/update-icon-cache.gtk2 ]; then - $SNAPCRAFT_PART_INSTALL/usr/sbin/update-icon-cache.gtk2 "$theme_dir" + if [ -f $SNAPCRAFT_STAGE/usr/sbin/update-icon-cache.gtk2 ]; then + $SNAPCRAFT_STAGE/usr/sbin/update-icon-cache.gtk2 "$theme_dir" fi done after: |