From bba7b3afc92b7668ed927009fd9f61b0f96b9beb Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Sat, 13 Jun 2020 22:07:55 +0200
Subject: [PATCH] fix appimage

---
 install/linux/linux_appimages.sh | 15 +++++++--------
 snapcraft.yaml                   |  3 ---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/install/linux/linux_appimages.sh b/install/linux/linux_appimages.sh
index be1197025..a79cf657e 100644
--- a/install/linux/linux_appimages.sh
+++ b/install/linux/linux_appimages.sh
@@ -24,13 +24,14 @@ fi
 
 sh linux_make_boundle.sh $@
 
-mv usr/bin/libIFX* usr/lib/
-
 cd $DISTRIB_PATH
 
+mv usr/bin/libIFX* usr/lib/
+rm -r lib
+
 export VERSION=$(cat $INSTALL_PATH/../../ML_VERSION)
 
-mv usr/bin/meshlabserver .
+mv usr/bin/meshlabserver ..
 $INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab.desktop -appimage
 mv *.AppImage ../MeshLab$VERSION-linux.AppImage
 chmod +x ../MeshLab$VERSION-linux.AppImage
@@ -40,8 +41,8 @@ rm *.desktop
 rm *.png
 rm usr/share/applications/meshlab.desktop
 cp $INSTALL_PATH/resources/meshlab_server.desktop usr/share/applications/
-mv usr/bin/meshlab .
-mv meshlabserver usr/bin
+mv usr/bin/meshlab ..
+mv ../meshlabserver usr/bin
 
 $INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab_server.desktop -appimage
 mv *.AppImage ../MeshLabServer$VERSION-linux.AppImage
@@ -49,9 +50,7 @@ chmod +x ../MeshLabServer$VERSION-linux.AppImage
 
 
 cp $INSTALL_PATH/resources/default.desktop usr/share/applications/meshlab.desktop
-mv meshlab usr/bin/
-
-rm -r lib
+mv ../meshlab usr/bin/
 
 chmod +x usr/bin/meshlab
 chmod +x usr/bin/meshlabserver
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 50ef1ff3a..7b6382105 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -112,8 +112,5 @@ parts:
       mv shaders/ $SNAPCRAFT_PART_INSTALL/usr/share/meshlab/
       
       #tmp: moving libIXF to bin directory
-      echo "--------"
-      ls -l $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/
-      echo "--------"
       mv $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/libIFX* $SNAPCRAFT_PART_INSTALL/usr/bin/
       mv $SNAPCRAFT_PART_INSTALL/usr/bin/libIFXCoreStatic.a $SNAPCRAFT_PART_INSTALL/usr/lib/meshlab/