From 87f734c751632feb09f6e44d5439a1a804761f3d Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 4 Jun 2020 17:27:40 +0200 Subject: [PATCH] snap folder moved inside install/linux/resources --- .github/workflows/BuildAndRelease.yml | 2 +- install/linux/{ => resources}/snap/README.md | 0 install/linux/{ => resources}/snap/meshlab.desktop | 0 install/linux/{ => resources}/snap/snap_noversion.yaml | 2 +- snapcraft.yaml | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename install/linux/{ => resources}/snap/README.md (100%) rename install/linux/{ => resources}/snap/meshlab.desktop (100%) rename install/linux/{ => resources}/snap/snap_noversion.yaml (96%) diff --git a/.github/workflows/BuildAndRelease.yml b/.github/workflows/BuildAndRelease.yml index 8c8c56ef1..f88946fbc 100644 --- a/.github/workflows/BuildAndRelease.yml +++ b/.github/workflows/BuildAndRelease.yml @@ -30,7 +30,7 @@ jobs: /usr/libexec/PlistBuddy -c "Set CFBundleVersion ${{steps.envs.outputs.date}}" src/meshlab/Info.plist - name: Update Snap file run: | - sed "s%MESHLAB_VERSION%$(cat ML_VERSION)%g" install/linux/snap/snap_noversion.yaml > snapcraft.yaml + sed "s%MESHLAB_VERSION%$(cat ML_VERSION)%g" install/linux/resources/snap/snap_noversion.yaml > snapcraft.yaml - name: commit ML_VERSION, snapcraft.yaml and Info.plist change uses: stefanzweifel/git-auto-commit-action@v4.1.1 with: diff --git a/install/linux/snap/README.md b/install/linux/resources/snap/README.md similarity index 100% rename from install/linux/snap/README.md rename to install/linux/resources/snap/README.md diff --git a/install/linux/snap/meshlab.desktop b/install/linux/resources/snap/meshlab.desktop similarity index 100% rename from install/linux/snap/meshlab.desktop rename to install/linux/resources/snap/meshlab.desktop diff --git a/install/linux/snap/snap_noversion.yaml b/install/linux/resources/snap/snap_noversion.yaml similarity index 96% rename from install/linux/snap/snap_noversion.yaml rename to install/linux/resources/snap/snap_noversion.yaml index 2da68f193..f4af0257a 100644 --- a/install/linux/snap/snap_noversion.yaml +++ b/install/linux/resources/snap/snap_noversion.yaml @@ -101,7 +101,7 @@ parts: rm -r plugins/plugins.txt rm -r README.md - cp ../install/linux/snap/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ + cp ../install/linux/resources/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 diff --git a/snapcraft.yaml b/snapcraft.yaml index f65265a95..bccb4128a 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -101,7 +101,7 @@ parts: rm -r plugins/plugins.txt rm -r README.md - cp ../install/linux/snap/meshlab.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/ + cp ../install/linux/resources/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