git.iko.soy/typeable/pandoc
on master help sign in
Improved fetching of pandoc-citeproc man page.
commitf8e58dea023529b8cee188f8c4a4e2e3d386455d authorJohn MacFarlane <jgm@berkeley.edu> dateSat 24 Oct 2015, 22:00 (11 years ago) parent797ec7c
2 files changed+16−4
compare with master
unifiedsplit
make_deb.sh+9−3 make_osx_package.sh+7−1
make_deb.sh+9−3
@@ -16,6 +16,7 @@ DIST=`pwd`/$BASE
1616DEST=$DIST/usr
1717ME=$(whoami)
1818COPYRIGHT=$DEST/share/doc/pandoc/copyright
19+TEMPDIR=make_binary_package.tmp.$$
1920
2021# We need this for hsb2hs:
2122PATH=$LOCAL/bin:$PATH
@@ -27,7 +28,12 @@ which hsb2hs || stack install --stack-yaml stack.hsb2hs.yaml
2728stack install --stack-yaml deb/stack.yaml
2829
2930# get pandoc-citeproc man page:
30−PANDOC_CITEPROC_PATH=`stack unpack -d make_binary_package.tmp.$$ pandoc-citeproc | awk '{print $3;}'`
31+PANDOC_CITEPROC_VERSION=`pandoc-citeproc --version | awk '{print $2;}'`
32+PANDOC_CITEPROC_TARBALL=https://hackage.haskell.org/package/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}.tar.gz
33+mkdir $TEMPDIR
34+curl ${PANDOC_CITEPROC_TARBALL} | tar xzC $TEMPDIR
35+PANDOC_CITEPROC_PATH=$TEMPDIR/pandoc-citeproc/${PANDOC_CITEPROC_VERSION}
36+
3137strip $LOCAL/bin/pandoc
3238strip $LOCAL/bin/pandoc-citeproc
3339mkdir -p $DEST/bin
@@ -40,13 +46,13 @@ cp $LOCAL/bin/pandoc $DEST/bin/
4046cp $LOCAL/bin/pandoc-citeproc $DEST/bin/
4147cp $LOCAL/share/man/man1/pandoc.1 $DEST/share/man/man1/pandoc.1
4248gzip -9 $DEST/share/man/man1/pandoc.1
43−cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
49+cp ${PANDOC_CITEPROC_pATH}/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
4450gzip -9 $DEST/share/man/man1/pandoc-citeproc.1
4551cp COPYRIGHT $COPYRIGHT
4652echo "" >> $COPYRIGHT
4753echo "pandoc-citeproc" >> $COPYRIGHT
4854cat $PANDOC_CITEPROC_PATH/LICENSE >> $COPYRIGHT
49−rm -rf make_binary_package.tmp.$$
55+rm -rf $TEMPDIR
5056
5157INSTALLED_SIZE=$(du -B 1024 -s $DEST | awk '{print $1}')
5258mkdir $DIST/DEBIAN
make_osx_package.sh+7−1
@@ -17,6 +17,7 @@ PATH=$LOCALBIN:$PATH
1717
1818# echo Removing old files...
1919rm -rf $DIST
20+mkdir -p $DIST
2021mkdir -p $RESOURCES
2122stack setup
2223which hsb2hs | stack install --stack-yaml=stack.hsb2hs.yaml
@@ -27,7 +28,12 @@ stack install --stack-yaml=osx/stack.yaml
2728
2829echo Getting man pages...
2930make man/pandoc.1
30−PANDOC_CITEPROC_PATH=`stack unpack -d $DIST pandoc-citeproc | awk '{print $3;}'`
31+
32+# get pandoc-citeproc man page:
33+PANDOC_CITEPROC_VERSION=`pandoc-citeproc --version | awk '{print $2;}'`
34+PANDOC_CITEPROC_TARBALL=https://hackage.haskell.org/package/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}.tar.gz
35+curl ${PANDOC_CITEPROC_TARBALL} | tar xzC $DIST
36+PANDOC_CITEPROC_PATH=$DIST/pandoc-citeproc/${PANDOC_CITEPROC_VERSION}
3137
3238mkdir -p $DEST/bin
3339mkdir -p $DEST/share/man/man1