about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <vincent@spotify.com>2014-08-22T16·56+0200
committerVincent Ambo <vincent@spotify.com>2014-08-22T16·56+0200
commit3a86d653ce759d6e9daff93d0da8fa588d3b404e (patch)
treea166c58f96e027e5de1207ceeb3a110de047d5bf
parent8d2fefec8fea73c680a5c7eb43bf73c0c33e9df0 (diff)
.dockerignore, make clean and new PKGBUILD
- Added .dockerignore file
- added make target for cleaning up
- modified PKGBUILD to build in symlink to checkout (yeah this isn't
  really how you build Arch packages but that's besides the point! :))
-rw-r--r--.dockerignore6
-rw-r--r--Makefile3
-rw-r--r--arch/PKGBUILD12
3 files changed, 15 insertions, 6 deletions
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000000..b6d3d3e812c9
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+dist
+res
+src
+tools
+arch/pkg
+arch/src
diff --git a/Makefile b/Makefile
index 14fd61ae30c3..00d77dd36cfd 100644
--- a/Makefile
+++ b/Makefile
@@ -12,3 +12,6 @@ $(ARCH_PKG):
 docker: archpkg
 	cat Dockerfile.raw | envsubst > Dockerfile; \
 	docker build -t tazjin/tazblog .
+
+clean:
+	rm -rf dist arch/*.pkg.tar.xz arch/pkg arch/src arch/*. Dockerfile
diff --git a/arch/PKGBUILD b/arch/PKGBUILD
index d6c7ea46cf74..02ff790fd729 100644
--- a/arch/PKGBUILD
+++ b/arch/PKGBUILD
@@ -7,23 +7,23 @@ arch=('i686' 'x86_64')
 url="http://tazj.in"
 license=('MIT')
 makedepends=('ghc' 'cabal-install')
-source=(https://bitbucket.org/tazjin/tazblog-haskell/get/$pkgver.tar.gz)
-md5sums=('SKIP')
-
+source=('tazblog@.service')
+sha1sums=('6aeb901a9d0e25763c9c99168a440dd5ac99ffc1')
 
 build() {
   cd "$srcdir"
-  cd tazjin-*
+  test -e blog-src || ln -fs ../../ blog-src
+  cd blog-src
 
-  cabal update
   cabal sandbox init
+  cabal update
   cabal install -j --only-dependencies
   cabal build
 }
 
 package() {
   cd "$srcdir"
-  cd tazjin-*
+  cd blog-src
 
   # Install blog itself
   install -d "${pkgdir}/usr/bin"