git.iko.soy/typeable/pandoc
on master help sign in
OSX package: Create .zip rather than .dmg.
commitfcc94c788bc6f021da4df0f2e80ed4cff577d9a2 authorJohn MacFarlane <fiddlosopher@gmail.com> dateSun 8 Dec 2013, 10:30 (13 years ago) parent8e255fa
3 files changed+17−10
compare with master
unifiedsplit
github-upload.sh+2−2 googlecode-upload.sh+1−1 make_osx_package.sh+14−7
github-upload.sh+2−2
@@ -7,8 +7,8 @@ read -s -p "Token (https://github.com/settings/applications): " TOKEN
77curl -H "Authorization: token $TOKEN" \
88 -H "Accept: application/vnd.github.manifold-preview" \
99 -H "Content-Type: application/x-apple-diskimage" \
10− --data-binary @$FULLNAME.dmg \
11− "https://uploads.github.com/repos/jgm/pandoc/releases/$VERSION/assets?name=$FULLNAME.dmg"
10+ --data-binary @$FULLNAME.pkg.zip \
11+ "https://uploads.github.com/repos/jgm/pandoc/releases/$VERSION/assets?name=$FULLNAME.pkg.zip"
1212
1313curl -H "Authorization: token $TOKEN" \
1414 -H "Accept: application/vnd.github.manifold-preview" \
googlecode-upload.sh+1−1
@@ -2,4 +2,4 @@
22VERSION=$1
33googlecode_upload.py -s "Source tarball" -p pandoc -u fiddlosopher --labels=Featured,Type-Source,OpSys-All dist/pandoc-$VERSION.tar.gz
44googlecode_upload.py -s "Windows installer" -p pandoc -u fiddlosopher --labels=Featured,Type-Installer,OpSys-Windows pandoc-$VERSION.msi
5−googlecode_upload.py -s "Mac OS X installer" -p pandoc -u fiddlosopher --labels=Featured,Type-Installer,OpSys-OSX pandoc-$VERSION.dmg
5+googlecode_upload.py -s "Mac OS X installer" -p pandoc -u fiddlosopher --labels=Featured,Type-Installer,OpSys-OSX pandoc-$VERSION.pkg.zip
make_osx_package.sh+14−7
@@ -1,4 +1,4 @@
1−#!/bin/sh -e
1+#!/bin/bash -e
22
33DIST=`pwd`/osx_package
44SANDBOX=`pwd`/.cabal-sandbox
@@ -13,6 +13,9 @@ CODESIGNID="Developer ID Application: John Macfarlane"
1313PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
1414EXES="pandoc pandoc-citeproc biblio2yaml"
1515
16+read -s -p "sudo password: " PASSWORD
17+echo $PASSWORD | sudo -S echo "Password valid, continuing."
18+
1619echo Removing old files...
1720rm -rf $DIST
1821mkdir -p $RESOURCES
@@ -50,6 +53,8 @@ codesign --force --sign "$CODESIGNID" $DEST/bin/pandoc
5053spctl --assess --type execute $DEST/bin/pandoc
5154
5255echo Creating OSX package...
56+# remove old package first
57+echo $PASSWORD | sudo -S rm -rf $BASE.pkg $BASE.dmg
5358
5459sudo $PACKAGEMAKER \
5560 --root $ROOT \
@@ -67,11 +72,13 @@ sudo codesign --force --sign "$CODESIGNID" $BASE.pkg
6772# make sure it's valid...
6873spctl --assess --type install $BASE.pkg
6974
70−echo Creating disk image...
75+echo Creating zip...
76+zip -9 -r $BASE.pkg.zip $BASE.pkg
7177
72−sudo hdiutil create "$BASE.dmg" \
73− -format UDZO -ov \
74− -volname "pandoc $VERSION" \
75− -srcfolder $BASE.pkg
76−sudo hdiutil internet-enable "$BASE.dmg"
78+# echo Creating disk image...
79+# sudo hdiutil create "$BASE.dmg" \
80+# -format UDZO -ov \
81+# -volname "pandoc $VERSION" \
82+# -srcfolder $BASE.pkg
83+# sudo hdiutil internet-enable "$BASE.dmg"
7784