Package files directly in snapcraft.yaml

We don't need to convert things anymore, so reference files directly in
the snap yaml file.

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9d52eb354fd2269b0ecb1a40d0721ca2861fae6b..ab82e56c66dffcb0d8375214f98ab9532dc6b988 100644 (file)
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -33,12 +33,6 @@ jobs:
     container: snapcore/snapcraft
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-      - run: npm install
-      - run: ./utils/use_require.js --clean --as commonjs --with-app
-      - run: |
-          cp utils/launch.sh build/launch.sh
-          cp snap/local/svc_wrapper.sh build/svc_wrapper.sh
       - run: |
           VERSION=$(grep '"version"' package.json | cut -d '"' -f 4)
           echo $VERSION

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 94886d47ebd6c2b05074750ebf2ebb8a7d81f146..b5b26a033b6605d9d9888b8276ab3ad9041c26ef 100644 (file)
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -13,8 +13,24 @@ confinement: strict
 
 parts:
     novnc:
-        source: build/
+        source: .
         plugin: dump
+        organize:
+            utils/launch.sh: /
+        stage:
+            - vnc.html
+            - app
+            - core/**/*.js
+            - vendor/**/*.js
+            - launch.sh
+        stage-packages:
+            - bash
+
+    svc-script:
+        source: snap/local
+        plugin: dump
+        stage:
+            - svc_wrapper.sh
         stage-packages:
             - bash
             - jq