git.iko.soy/typeable/pandoc
on master help sign in
Moved PATH setting in make_deb, make_osx_package.
797ec7cJohn MacFarlane
make_deb.sh+3−2
compare with master
unifiedsplit
@@ -17,11 +17,12 @@ DEST=$DIST/usr
17ME=$(whoami)
17ME=$(whoami)
18COPYRIGHT=$DEST/share/doc/pandoc/copyright
18COPYRIGHT=$DEST/share/doc/pandoc/copyright
19
19
20+# We need this for hsb2hs:
21+PATH=$LOCAL/bin:$PATH
22+
20stack setup
23stack setup
21stack clean
24stack clean
22which hsb2hs || stack install --stack-yaml stack.hsb2hs.yaml
25which hsb2hs || stack install --stack-yaml stack.hsb2hs.yaml
23−# We need this for hsb2hs:
24−PATH=$LOCAL/bin:$PATH
25
26
26stack install --stack-yaml deb/stack.yaml
27stack install --stack-yaml deb/stack.yaml
27
28
make_osx_package.sh+3−2
@@ -12,13 +12,14 @@ BASE=pandoc-$VERSION
12ME=$(whoami)
12ME=$(whoami)
13PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
13PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
14
14
15+# We need this for hsb2hs:
16+PATH=$LOCALBIN:$PATH
17+
15# echo Removing old files...
18# echo Removing old files...
16rm -rf $DIST
19rm -rf $DIST
17mkdir -p $RESOURCES
20mkdir -p $RESOURCES
18stack setup
21stack setup
19which hsb2hs | stack install --stack-yaml=stack.hsb2hs.yaml
22which hsb2hs | stack install --stack-yaml=stack.hsb2hs.yaml
20−# We need this for hsb2hs:
21−PATH=$LOCALBIN:$PATH
22
23
23echo Building pandoc...
24echo Building pandoc...
24stack clean
25stack clean