@@ -11,6 +11,8 @@ SCRIPTS=$OSX/osx-resources
11BASE=pandoc-$VERSION
11BASE=pandoc-$VERSION
12ME=$(whoami)
12ME=$(whoami)
13PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
13PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
14+DEVELOPER_ID_APPLICATION=${DEVELOPER_ID_APPLICATION:-Developer ID Application: John Macfarlane}
15+DEVELOPER_ID_INSTALLER=${DEVELOPER_ID_INSTALLER:-Developer ID Installer: John Macfarlane}
15# We need this for hsb2hs:
17# We need this for hsb2hs:
16PATH=$LOCALBIN:$PATH
18PATH=$LOCALBIN:$PATH
@@ -51,7 +53,7 @@ $LOCALBIN/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html
52echo Signing pandoc executable...
54echo Signing pandoc executable...
54−codesign --force --sign "Developer ID Application: John Macfarlane" $DEST/bin/pandoc
56+codesign --force --sign ${DEVELOPER_ID_APPLICATION} $DEST/bin/pandoc
55# make sure it's valid... returns nonzero exit code if it isn't:
57# make sure it's valid... returns nonzero exit code if it isn't:
56spctl --assess --type execute $DEST/bin/pandoc
58spctl --assess --type execute $DEST/bin/pandoc
@@ -60,7 +62,7 @@ echo Creating OSX package...
60rm -rf $BASE.pkg
62rm -rf $BASE.pkg
62pkgbuild --root $DIST/pandoc --identifier net.johnmacfarlane.pandoc --version 1.13 --ownership recommended $DIST/pandoc.pkg
64pkgbuild --root $DIST/pandoc --identifier net.johnmacfarlane.pandoc --version 1.13 --ownership recommended $DIST/pandoc.pkg
63−productbuild --distribution osx/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "Developer ID Installer: John Macfarlane" $BASE-osx.pkg
65+productbuild --distribution osx/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign ${DEVELOPER_ID_INSTALLER} $BASE-osx.pkg
65# verify signature
67# verify signature
66spctl --assess --type install $BASE-osx.pkg
68spctl --assess --type install $BASE-osx.pkg