From 2c934be8ab01e18fc2f5c56c35a6957f2d7b3af3 Mon Sep 17 00:00:00 2001
From: Anthony Fok <foka@debian.org>
Date: Fri, 24 Aug 2018 09:35:07 -0600
Subject: [PATCH] snap: Refactor, fix bin/node, and add bin/postcss

---
 snapcraft.yaml | 58 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 6e851767..fd862fe0 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -21,10 +21,6 @@ parts:
     go-importpath: github.com/gohugoio/hugo
     build-packages:
       - git
-    stage-packages:
-      - git
-      - nodejs
-      - python-pygments
     override-build: |
       echo "\nStarting override-build:"
       export GOPATH=$(dirname $SNAPCRAFT_PART_INSTALL)/go
@@ -50,25 +46,41 @@ parts:
       ls -l $SNAPCRAFT_PART_INSTALL/bin/hugo
       strip --remove-section=.comment --remove-section=.note $SNAPCRAFT_PART_INSTALL/bin/hugo
       ls -l $SNAPCRAFT_PART_INSTALL/bin/hugo
-      echo " * Remove unneeded files..."
-      rm -rf $SNAPCRAFT_PART_INSTALL/etc
-      rm -f $SNAPCRAFT_PART_INSTALL/usr/bin/[^gp]*
-      rm -f $SNAPCRAFT_PART_INSTALL/usr/bin/git-*
-      rm -f $SNAPCRAFT_PART_INSTALL/usr/bin/p[^y]*
-      rm -f $SNAPCRAFT_PART_INSTALL/usr/lib/git-core/git-[^lr]*
-      rm -f $SNAPCRAFT_PART_INSTALL/usr/lib/git-core/git-ls-*
-      rm -f $SNAPCRAFT_PART_INSTALL/usr/lib/git-core/git-re[^v]*
-      rm -f $SNAPCRAFT_PART_INSTALL/usr/lib/git-core/git-revert
-      rm -f $SNAPCRAFT_PART_INSTALL/usr/lib/git-core/git-rm
-      rm -rf $SNAPCRAFT_PART_INSTALL/usr/lib/git-core/mergetools
-      rm -rf $SNAPCRAFT_PART_INSTALL/usr/lib/*/perl
-      rm -rf $SNAPCRAFT_PART_INSTALL/usr/lib/mime
-      rm -rf $SNAPCRAFT_PART_INSTALL/usr/lib/python*/lib2to3
-      rm -rf $SNAPCRAFT_PART_INSTALL/usr/lib/valgrind
-      rm -rf $SNAPCRAFT_PART_INSTALL/usr/sbin
-      rm -rf $SNAPCRAFT_PART_INSTALL/usr/share/[^p]*
-      rm -rf $SNAPCRAFT_PART_INSTALL/usr/share/p[^y]*
-      rm -rf $SNAPCRAFT_PART_INSTALL/var
     after: [go]
+
   go:
     source-tag: go1.10.3
+
+  git:
+    plugin: nil
+    stage-packages: [git]
+    prime: [usr/bin/git]
+
+  node:
+    plugin: nodejs
+    node-packages: [postcss-cli]
+    filesets:
+      node:
+        - bin/node
+      postcss:
+        - bin/postcss
+        - lib/node_modules/postcss-cli/*
+    prime:
+      - $node
+      - $postcss
+
+  pygments:
+    plugin: python
+    python-packages: [Pygments]
+    prime:
+      - bin/pygmentize
+      - lib/python*/site-packages/Pygments-*.dist-info/*
+      - lib/python*/site-packages/pygments/*
+      - usr/bin/python*
+      - -usr/bin/python*m
+      - usr/lib/python*/*
+      - -usr/lib/python*/distutils/*
+      - -usr/lib/python*/email/*
+      - -usr/lib/python*/lib2to3/*
+      - -usr/lib/python*/tkinter/*
+      - -usr/lib/python*/unittest/*
-- 
2.30.2