From be40e562ed4aec7ea734d0d8a235b8c467883fac Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 4 Jun 2020 14:35:24 +0200 Subject: [PATCH] fix snap icon --- install/linux/snap/meshlab.desktop | 2 +- install/linux/snap/snap_noversion.yaml | 11 ++++------- snapcraft.yaml | 7 ++----- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/install/linux/snap/meshlab.desktop b/install/linux/snap/meshlab.desktop index a80c21677..bf2e7ce2b 100644 --- a/install/linux/snap/meshlab.desktop +++ b/install/linux/snap/meshlab.desktop @@ -6,7 +6,7 @@ GenericName=Mesh processing GenericName[en_GB]=Mesh processing Comment=View and process meshes Type=Application -Icon=icon.png +Icon=/snap/meshlab/x1/usr/share/icons/meshlab.png Exec=meshlab %F Terminal=false MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf; diff --git a/install/linux/snap/snap_noversion.yaml b/install/linux/snap/snap_noversion.yaml index 8c767ef8c..2da68f193 100644 --- a/install/linux/snap/snap_noversion.yaml +++ b/install/linux/snap/snap_noversion.yaml @@ -87,9 +87,8 @@ parts: mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/meshlab mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/ - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/ - + mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons + cd distrib rm -r lib/macx64/ @@ -102,10 +101,8 @@ parts: rm -r plugins/plugins.txt rm -r README.md - cp install/linux/snap/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ - cp meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/applications/ - cp meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/meshlab.png - mv meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/meshlab.png + cp ../install/linux/snap/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ + mv meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/meshlab.png mv meshlabserver $SNAPCRAFT_PART_INSTALL/usr/bin mv meshlab $SNAPCRAFT_PART_INSTALL/usr/bin mv LICENSE.txt $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab/ diff --git a/snapcraft.yaml b/snapcraft.yaml index 09423c5e5..415866ff5 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -87,8 +87,7 @@ parts: mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/meshlab mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/ - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/ + mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/icons cd distrib @@ -103,9 +102,7 @@ parts: rm -r README.md cp ../install/linux/snap/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ - cp meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/applications/icon.png - cp meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/hicolor/512x512/apps/meshlab.png - mv meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/Yaru/512x512/apps/meshlab.png + mv meshlab.png $SNAPCRAFT_PART_INSTALL/usr/share/icons/meshlab.png mv meshlabserver $SNAPCRAFT_PART_INSTALL/usr/bin mv meshlab $SNAPCRAFT_PART_INSTALL/usr/bin mv LICENSE.txt $SNAPCRAFT_PART_INSTALL/usr/share/doc/meshlab/