From de8d4e2f86749b5748f8c6b61d0ebdc16177c354 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 19 Mar 2017 17:35:19 +0100
Subject: [PATCH] Fixed paths: deb->linux.
---
linux/Dockerfile | 6 ++----
linux/make_deb.sh | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/linux/Dockerfile b/linux/Dockerfile
index 0a9cc710d..630abc17e 100644
--- a/linux/Dockerfile
+++ b/linux/Dockerfile
@@ -19,13 +19,11 @@ RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
--flag 'pandoc:embed_data_files' \
--test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
pandoc pandoc-citeproc
-COPY make_deb.sh .
-COPY make_tarball.sh .
CMD git pull && \
git checkout -b work $TREE && \
stack install --stack-yaml stack.pkg.yaml \
--local-bin-path /artifacts --flag 'pandoc:embed_data_files' \
--test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
pandoc pandoc-citeproc && \
- bash make_deb.sh && \
- bash make_tarball.sh
+ bash linux/make_deb.sh && \
+ bash linux/make_tarball.sh
diff --git a/linux/make_deb.sh b/linux/make_deb.sh
index 70b99a5ee..3510ce6c4 100755
--- a/linux/make_deb.sh
+++ b/linux/make_deb.sh
@@ -41,7 +41,7 @@ echo "pandoc-citeproc" >> $COPYRIGHT
INSTALLED_SIZE=$(du -k -s $DEST | awk '{print $1}')
mkdir $DIST/DEBIAN
-perl -pe "s/VERSION/$DEBVER/" deb/control.in | \
+perl -pe "s/VERSION/$DEBVER/" linux/control.in | \
perl -pe "s/ARCHITECTURE/$ARCHITECTURE/" | \
perl -pe "s/INSTALLED_SIZE/$INSTALLED_SIZE/" \
> $DIST/DEBIAN/control