From a635ac1efd893c0b909ff97d7ccdcd9875305ccf Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Sun, 14 Jun 2020 11:01:26 +0200 Subject: [PATCH] modified .desktop for appimage --- install/linux/linux_appimages.sh | 32 +++++++++---------- install/linux/linux_deploy.sh | 2 -- install/linux/linux_make_boundle.sh | 9 ++++-- ...fault.desktop => meshlab_appimage.desktop} | 4 +-- ...esktop => meshlab_server_appimage.desktop} | 2 -- 5 files changed, 23 insertions(+), 26 deletions(-) rename install/linux/resources/{default.desktop => meshlab_appimage.desktop} (88%) mode change 100755 => 100644 rename install/linux/resources/{meshlab_server.desktop => meshlab_server_appimage.desktop} (90%) mode change 100755 => 100644 diff --git a/install/linux/linux_appimages.sh b/install/linux/linux_appimages.sh index 1214739f7..395ba4665 100644 --- a/install/linux/linux_appimages.sh +++ b/install/linux/linux_appimages.sh @@ -27,30 +27,30 @@ sh linux_make_boundle.sh $@ cd $DISTRIB_PATH mv usr/bin/libIFX* . -rm -r lib export VERSION=$(cat $INSTALL_PATH/../../ML_VERSION) -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 - -rm AppRun -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 - $INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab_server.desktop -appimage mv *.AppImage ../MeshLabServer$VERSION-linux.AppImage chmod +x ../MeshLabServer$VERSION-linux.AppImage +rm AppRun +rm *.desktop +rm *.png -cp $INSTALL_PATH/resources/default.desktop usr/share/applications/meshlab.desktop -mv ../meshlab usr/bin/ +#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 + +#rm AppRun +#rm *.desktop +#rm *.png +#rm usr/share/applications/meshlab.desktop +#mv usr/bin/meshlab .. +#mv ../meshlabserver usr/bin +#cp $INSTALL_PATH/resources/default.desktop usr/share/applications/meshlab.desktop +#mv ../meshlab usr/bin/ chmod +x usr/bin/meshlab chmod +x usr/bin/meshlabserver diff --git a/install/linux/linux_deploy.sh b/install/linux/linux_deploy.sh index 8fffb34ec..84fded4c4 100644 --- a/install/linux/linux_deploy.sh +++ b/install/linux/linux_deploy.sh @@ -26,8 +26,6 @@ cd $DISTRIB_PATH $INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab.desktop -bundle-non-qt-libs -executable=usr/bin/meshlabserver -rm -r lib - chmod +x usr/bin/meshlab chmod +x usr/bin/meshlabserver diff --git a/install/linux/linux_make_boundle.sh b/install/linux/linux_make_boundle.sh index 52317bf37..0a45dd717 100644 --- a/install/linux/linux_make_boundle.sh +++ b/install/linux/linux_make_boundle.sh @@ -39,7 +39,8 @@ mkdir -p usr/share/doc/meshlab mkdir -p usr/share/icons/hicolor/512x512/apps/ mkdir -p usr/share/icons/Yaru/512x512/apps/ -cp $INSTALL_PATH/resources/default.desktop usr/share/applications/meshlab.desktop +cp $INSTALL_PATH/resources/meshlab_appimage.desktop usr/share/applications/meshlab.desktop +cp $INSTALL_PATH/resources/meshlab_server_appimage.desktop usr/share/applications/meshlab_server.desktop mv meshlab.png usr/share/icons/hicolor/512x512/apps/meshlab.png mv meshlab.png usr/share/icons/Yaru/512x512/apps/meshlab.png mv meshlab usr/bin @@ -52,7 +53,9 @@ mv plugins/ usr/lib/meshlab/ mv lib/linux/* usr/lib/meshlab/ #chrpath -r ../lib/ usr/lib/meshlab/plugins/*.so mv shaders/ usr/share/meshlab/ +rm -r lib #tmp: moving libIXF to bin directory -mv usr/lib/meshlab/libIFX* usr/bin/ -mv usr/bin/libIFXCoreStatic.a usr/lib/meshlab/ +#mv usr/lib/meshlab/libIFX* usr/bin/ +#mv usr/bin/libIFXCoreStatic.a usr/lib/meshlab/ + diff --git a/install/linux/resources/default.desktop b/install/linux/resources/meshlab_appimage.desktop old mode 100755 new mode 100644 similarity index 88% rename from install/linux/resources/default.desktop rename to install/linux/resources/meshlab_appimage.desktop index 341e776b5..9aeb2ba2e --- a/install/linux/resources/default.desktop +++ b/install/linux/resources/meshlab_appimage.desktop @@ -2,11 +2,9 @@ Version=1.0 Type=Application Name=MeshLab -Name[en_GB]=MeshLab GenericName=Mesh processing -GenericName[en_GB]=Mesh processing Comment=View and process meshes -Exec=usr/bin/meshlab %F +Exec=env LD_LIBRARY_PATH=usr/lib:usr/lib/meshlab usr/bin/meshlab %F Icon=meshlab 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/resources/meshlab_server.desktop b/install/linux/resources/meshlab_server_appimage.desktop old mode 100755 new mode 100644 similarity index 90% rename from install/linux/resources/meshlab_server.desktop rename to install/linux/resources/meshlab_server_appimage.desktop index 7fefb2162..2327a0298 --- a/install/linux/resources/meshlab_server.desktop +++ b/install/linux/resources/meshlab_server_appimage.desktop @@ -2,9 +2,7 @@ Version=1.0 Type=Application Name=MeshLabServer -Name[en_GB]=MeshLabServer GenericName=Batch mesh processing -GenericName[en_GB]=Batch mesh processing Comment=Batch Processor MeshLab Exec=usr/bin/meshlabserver Icon=meshlab