git.iko.soy/typeable/pandoc
on master help sign in
Fixed paths: deb->linux.
commitde8d4e2f86749b5748f8c6b61d0ebdc16177c354 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 19 Mar 2017, 17:35 (10 years ago) parent4a1c3fa
2 files changed+3−5
compare with master
unifiedsplit
linux/Dockerfile+2−4 linux/make_deb.sh+1−1
linux/Dockerfile+2−4
@@ -19,13 +19,11 @@ RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
1919 --flag 'pandoc:embed_data_files' \
2020 --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
2121 pandoc pandoc-citeproc
22−COPY make_deb.sh .
23−COPY make_tarball.sh .
2422CMD git pull && \
2523 git checkout -b work $TREE && \
2624 stack install --stack-yaml stack.pkg.yaml \
2725 --local-bin-path /artifacts --flag 'pandoc:embed_data_files' \
2826 --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
2927 pandoc pandoc-citeproc && \
30− bash make_deb.sh && \
31− bash make_tarball.sh
28+ bash linux/make_deb.sh && \
29+ bash linux/make_tarball.sh
linux/make_deb.sh+1−1
@@ -41,7 +41,7 @@ echo "pandoc-citeproc" >> $COPYRIGHT
4141
4242INSTALLED_SIZE=$(du -k -s $DEST | awk '{print $1}')
4343mkdir $DIST/DEBIAN
44−perl -pe "s/VERSION/$DEBVER/" deb/control.in | \
44+perl -pe "s/VERSION/$DEBVER/" linux/control.in | \
4545 perl -pe "s/ARCHITECTURE/$ARCHITECTURE/" | \
4646 perl -pe "s/INSTALLED_SIZE/$INSTALLED_SIZE/" \
4747 > $DIST/DEBIAN/control