From 28ee3a5ce64261ae7f8a1b5cc170bb84f83c8fcb Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Tue, 16 Jun 2020 19:37:57 +0200
Subject: [PATCH] fix snap

---
 install/linux/resources/AppRunSnap | 4 ++++
 snapcraft.yaml                     | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 install/linux/resources/AppRunSnap

diff --git a/install/linux/resources/AppRunSnap b/install/linux/resources/AppRunSnap
new file mode 100644
index 000000000..4c51a74ec
--- /dev/null
+++ b/install/linux/resources/AppRunSnap
@@ -0,0 +1,4 @@
+#!/bin/bash
+HERE="$(dirname "$(readlink -f "${0}")")"
+export LD_LIBRARY_PATH=${HERE}/usr/lib/meshlab:$LD_LIBRARY_PATH
+exec "${HERE}/usr/bin/meshlab" "$@"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 8be45085a..e877cc17e 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -16,7 +16,7 @@ confinement: strict
 
 apps:
   meshlab:
-    command: desktop-launch ./AppRun
+    command: desktop-launch $SNAP/AppRun
     plugs: [home, x11, mir, opengl]
     desktop: usr/share/applications/meshlab.desktop
   meshlabserver:
@@ -88,9 +88,10 @@ parts:
       rsync -av distrib/* $SNAPCRAFT_PART_INSTALL/
       
       rm $SNAPCRAFT_PART_INSTALL/usr/share/applications/meshlab_server.desktop
-      
-      cp install/linux/resources/AppRunMeshLab $SNAPCRAFT_PART_INSTALL/
-      mv $SNAPCRAFT_PART_INSTALL/AppRunMeshLab $SNAPCRAFT_PART_INSTALL/AppRun
+      rm $SNAPCRAFT_PART_INSTALL/usr/share/applications/meshlab.desktop
+      cp install/linux/resources/snap/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/
+      cp install/linux/resources/AppRunSnap $SNAPCRAFT_PART_INSTALL/
+      mv $SNAPCRAFT_PART_INSTALL/AppRunSnap $SNAPCRAFT_PART_INSTALL/AppRun
       chmod +x $SNAPCRAFT_PART_INSTALL/AppRun
 
       #mkdir -p $SNAPCRAFT_PART_INSTALL/usr/bin