Make it work with modern snapcraft

getnikola · Oct 20, 2016 · ce193d7 · ce193d7
1 parent 8a60c09
commit ce193d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/snapcraft/stable/build.sh b/snapcraft/stable/build.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 snapcraft pull
 pip3 wheel --wheel-dir parts/nikola/packages --disable-pip-version-check --no-index --find-links parts/nikola/packages pillow
-snapcraft build
-snapcraft stage
-find prime/ -name '*.a' -exec rm {} \;
-snapcraft snap
+snapcraft
 
diff --git a/snapcraft/stable/script/nikola.sh b/snapcraft/stable/script/nikola.sh
@@ -18,4 +18,4 @@ export LC_ALL=$APPLOC
 export LANG=$APPLOC
 export LANGUAGE=${APPLANG%_*}
 
-$SNAP/usr/bin/nikola "$@"
+$SNAP/bin/nikola "$@"
diff --git a/snapcraft/stable/snapcraft.yaml b/snapcraft/stable/snapcraft.yaml
@@ -7,14 +7,18 @@ grade: stable
 
 apps:
     nikola:
-         command: nikola
+         command: nikola.sh
          plugs: [network, network-bind, home]
 
 parts:
+    nikola-script:
+        plugin: dump
+        source: script
     nikola:
+        source: git://github.com/getnikola/nikola.git
+        source-tag: v7.8.1
+        stage-packages:
+            - locales
+            - libc-bin
         plugin: python
-        python-packages:
-            - nikola
-            - pillow
-        python-version: python3
         build-packages: [libjpeg-dev]