@@ -2,11 +2,11 @@
22
33LOCALBIN=$HOME/.local/bin
44DIST=`pwd`/osx_package
5+OSX=`pwd`/osx
56VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
67RESOURCES=$DIST/Resources
78ROOT=$DIST/pandoc
89DEST=$ROOT/usr/local
9−OSX=osx
1010SCRIPTS=$OSX/osx-resources
1111BASE=pandoc-$VERSION
1212ME=$(whoami)
@@ -27,7 +27,7 @@ which hsb2hs || stack install --stack-yaml=stack.hsb2hs.yaml
2727
2828echo Building pandoc...
2929stack clean
30−stack install --stack-yaml=osx/stack.yaml --local-bin-path . pandoc pandoc-citeproc
30+stack install --stack-yaml=$OSX/stack.yaml --local-bin-path . pandoc pandoc-citeproc
3131
3232echo Getting man pages...
3333make man/pandoc.1
@@ -41,7 +41,7 @@ PANDOC_CITEPROC_PATH=$DIST/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}
4141mkdir -p $DEST/bin
4242mkdir -p $DEST/share/man/man1
4343for f in pandoc pandoc-citeproc; do
44− cp osx/$f $DEST/bin/;
44+ cp $OSX/$f $DEST/bin/;
4545done
4646cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
4747cp man/pandoc.1 $DEST/share/man/man1/
@@ -49,7 +49,7 @@ cp man/pandoc.1 $DEST/share/man/man1/
4949chown -R $ME:staff $DIST
5050
5151echo Copying license...
52−osx/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html
52+$OSX/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html
5353
5454# Removing executable signing because of a problem that arose in El Capitan
5555# "source=obsolete resource envelope"
@@ -64,13 +64,13 @@ echo Creating OSX package...
6464# remove old package first
6565rm -rf $BASE.pkg
6666
67−sed -e "s/PANDOCVERSION/$VERSION/" osx/distribution.xml.in > osx/distribution.xml
67+sed -e "s/PANDOCVERSION/$VERSION/" $OSX/distribution.xml.in > $OSX/distribution.xml
6868
6969pkgbuild --root $DIST/pandoc --identifier net.johnmacfarlane.pandoc --version 1.13 --ownership recommended $DIST/pandoc.pkg
70−productbuild --distribution osx/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "${DEVELOPER_ID_INSTALLER}" $BASE-osx.pkg
70+productbuild --distribution $OSX/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "${DEVELOPER_ID_INSTALLER}" $BASE-osx.pkg
7171
7272# verify signature
7373spctl --assess --type install $BASE-osx.pkg
7474
7575# cleanup
76−rm -r $DIST osx/pandoc osx/pandoc-citeproc
76+rm -r $DIST $OSX/pandoc $OSX/pandoc-citeproc