git.iko.soy/typeable/pandoc
on master help sign in
Fixed paths: deb->linux.
de8d4e2John MacFarlane
linux/Dockerfile+2−4
compare with master
unifiedsplit
@@ -19,13 +19,11 @@ RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
19 --flag 'pandoc:embed_data_files' \
19 --flag 'pandoc:embed_data_files' \
20 --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
20 --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
21 pandoc pandoc-citeproc
21 pandoc pandoc-citeproc
22−COPY make_deb.sh .
23−COPY make_tarball.sh .
24CMD git pull && \
22CMD git pull && \
25 git checkout -b work $TREE && \
23 git checkout -b work $TREE && \
26 stack install --stack-yaml stack.pkg.yaml \
24 stack install --stack-yaml stack.pkg.yaml \
27 --local-bin-path /artifacts --flag 'pandoc:embed_data_files' \
25 --local-bin-path /artifacts --flag 'pandoc:embed_data_files' \
28 --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
26 --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
29 pandoc pandoc-citeproc && \
27 pandoc pandoc-citeproc && \
30− bash make_deb.sh && \
28+ bash linux/make_deb.sh && \
31− bash make_tarball.sh
29+ bash linux/make_tarball.sh
linux/make_deb.sh+1−1
@@ -41,7 +41,7 @@ echo "pandoc-citeproc" >> $COPYRIGHT
41
41
42INSTALLED_SIZE=$(du -k -s $DEST | awk '{print $1}')
42INSTALLED_SIZE=$(du -k -s $DEST | awk '{print $1}')
43mkdir $DIST/DEBIAN
43mkdir $DIST/DEBIAN
44−perl -pe "s/VERSION/$DEBVER/" deb/control.in | \
44+perl -pe "s/VERSION/$DEBVER/" linux/control.in | \
45 perl -pe "s/ARCHITECTURE/$ARCHITECTURE/" | \
45 perl -pe "s/ARCHITECTURE/$ARCHITECTURE/" | \
46 perl -pe "s/INSTALLED_SIZE/$INSTALLED_SIZE/" \
46 perl -pe "s/INSTALLED_SIZE/$INSTALLED_SIZE/" \
47 > $DIST/DEBIAN/control
47 > $DIST/DEBIAN/control