diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-10-24 22:00:44 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-10-24 22:00:44 -0700 |
| commit | f8e58dea023529b8cee188f8c4a4e2e3d386455d (patch) | |
| tree | cba92d5d5c3290ccf5b092b48c857c759e2176e8 | |
| parent | 797ec7cb751327d344ac6d77e52edfca36115036 (diff) | |
| download | pandoc-f8e58dea023529b8cee188f8c4a4e2e3d386455d.tar.gz | |
Improved fetching of pandoc-citeproc man page.
| -rwxr-xr-x | make_deb.sh | 12 | ||||
| -rwxr-xr-x | make_osx_package.sh | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/make_deb.sh b/make_deb.sh index 68b0bae7f..ed630960f 100755 --- a/make_deb.sh +++ b/make_deb.sh @@ -16,6 +16,7 @@ DIST=`pwd`/$BASE DEST=$DIST/usr ME=$(whoami) COPYRIGHT=$DEST/share/doc/pandoc/copyright +TEMPDIR=make_binary_package.tmp.$$ # We need this for hsb2hs: PATH=$LOCAL/bin:$PATH @@ -27,7 +28,12 @@ which hsb2hs || stack install --stack-yaml stack.hsb2hs.yaml stack install --stack-yaml deb/stack.yaml # get pandoc-citeproc man page: -PANDOC_CITEPROC_PATH=`stack unpack -d make_binary_package.tmp.$$ pandoc-citeproc | awk '{print $3;}'` +PANDOC_CITEPROC_VERSION=`pandoc-citeproc --version | awk '{print $2;}'` +PANDOC_CITEPROC_TARBALL=https://hackage.haskell.org/package/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}.tar.gz +mkdir $TEMPDIR +curl ${PANDOC_CITEPROC_TARBALL} | tar xzC $TEMPDIR +PANDOC_CITEPROC_PATH=$TEMPDIR/pandoc-citeproc/${PANDOC_CITEPROC_VERSION} + strip $LOCAL/bin/pandoc strip $LOCAL/bin/pandoc-citeproc mkdir -p $DEST/bin @@ -40,13 +46,13 @@ cp $LOCAL/bin/pandoc $DEST/bin/ cp $LOCAL/bin/pandoc-citeproc $DEST/bin/ cp $LOCAL/share/man/man1/pandoc.1 $DEST/share/man/man1/pandoc.1 gzip -9 $DEST/share/man/man1/pandoc.1 -cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/ +cp ${PANDOC_CITEPROC_pATH}/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/ gzip -9 $DEST/share/man/man1/pandoc-citeproc.1 cp COPYRIGHT $COPYRIGHT echo "" >> $COPYRIGHT echo "pandoc-citeproc" >> $COPYRIGHT cat $PANDOC_CITEPROC_PATH/LICENSE >> $COPYRIGHT -rm -rf make_binary_package.tmp.$$ +rm -rf $TEMPDIR INSTALLED_SIZE=$(du -B 1024 -s $DEST | awk '{print $1}') mkdir $DIST/DEBIAN diff --git a/make_osx_package.sh b/make_osx_package.sh index 0849ced51..2356f1112 100755 --- a/make_osx_package.sh +++ b/make_osx_package.sh @@ -17,6 +17,7 @@ PATH=$LOCALBIN:$PATH # echo Removing old files... rm -rf $DIST +mkdir -p $DIST mkdir -p $RESOURCES stack setup which hsb2hs | stack install --stack-yaml=stack.hsb2hs.yaml @@ -27,7 +28,12 @@ stack install --stack-yaml=osx/stack.yaml echo Getting man pages... make man/pandoc.1 -PANDOC_CITEPROC_PATH=`stack unpack -d $DIST pandoc-citeproc | awk '{print $3;}'` + +# get pandoc-citeproc man page: +PANDOC_CITEPROC_VERSION=`pandoc-citeproc --version | awk '{print $2;}'` +PANDOC_CITEPROC_TARBALL=https://hackage.haskell.org/package/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}.tar.gz +curl ${PANDOC_CITEPROC_TARBALL} | tar xzC $DIST +PANDOC_CITEPROC_PATH=$DIST/pandoc-citeproc/${PANDOC_CITEPROC_VERSION} mkdir -p $DEST/bin mkdir -p $DEST/share/man/man1 |