aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <[email protected]>2022-08-17 14:01:36 -0700
committerJohn MacFarlane <[email protected]>2022-08-17 14:01:36 -0700
commitb3fdfb912c42f6a6d837e00bf71c59da753ea4ae (patch)
tree5bd6243974600c2d5c335b8d8eb9b45c63ad2b57
parent704a10a29e95d7ef787c1f7ccea3d4d5f5513c99 (diff)
macos release candidate: create symlink after download.
Otherwise we seem to get a full copy of the file!
-rw-r--r--.github/workflows/release-candidate.yml6
-rw-r--r--macos/Makefile7
2 files changed, 6 insertions, 7 deletions
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
index c536e5a74..3b4b829ac 100644
--- a/.github/workflows/release-candidate.yml
+++ b/.github/workflows/release-candidate.yml
@@ -112,11 +112,7 @@ jobs:
mkdir -p ${DEST}/bin
mkdir -p ${DEST}/share/man/man1
cp ~/.local/bin/pandoc ${DEST}/bin/
- SRCDIR=$(pwd)
- cd ${DEST}/bin
- strip pandoc
- ln -s pandoc pandoc-server
- cd ${SRCDIR}
+ strip ${DEST}/bin/pandoc
cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1
cp man/pandoc-server.1 ${DEST}/share/man/man1/pandoc-server.1
~/.local/bin/pandoc -s COPYING.md -Vpagetitle=License -o ${RESOURCES}/license.html
diff --git a/macos/Makefile b/macos/Makefile
index 25fa7cc6d..a0210b643 100644
--- a/macos/Makefile
+++ b/macos/Makefile
@@ -10,13 +10,16 @@ signed.txt: $(DEST)
codesign --force --options runtime -s "5U2WKE6DES" $(DEST)/bin/pandoc
echo "SIGNED" > signed.txt
-pandoc.pkg: signed.txt
+$(DEST)/bin/pandoc-server:
+ cd $(DEST)/bin && ln -s pandoc pandoc-server
+
+pandoc.pkg: $(DEST)/bin/pandoc-server signed.txt
pkgbuild --root pandoc --identifier net.johnmacfarlane.pandoc --version $(VERSION) --ownership recommended $@
$(BASE)-macOS.pkg: pandoc.pkg
productbuild --distribution distribution.xml --resources Resources --package-path $< --version $(VERSION) --sign 'Developer ID Installer: John Macfarlane' $@
-$(BASE)-macOS.zip: signed.txt
+$(BASE)-macOS.zip: $(DEST)/bin/pandoc-server signed.txt
ln -s $(DEST) $(BASE)
zip -r $@ $(BASE)