OSX package: Create .zip rather than .dmg.

garyross · Dec 8, 2013 · fcc94c7 · fcc94c7
1 parent 8e255fa
commit fcc94c7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/github-upload.sh b/github-upload.sh
@@ -7,8 +7,8 @@ read -s -p "Token (https://github.com/settings/applications): "  TOKEN
 curl -H "Authorization: token $TOKEN" \
      -H "Accept: application/vnd.github.manifold-preview" \
      -H "Content-Type: application/x-apple-diskimage" \
-     --data-binary @$FULLNAME.dmg \
-     "https://uploads.github.com/repos/jgm/pandoc/releases/$VERSION/assets?name=$FULLNAME.dmg"
+     --data-binary @$FULLNAME.pkg.zip \
+     "https://uploads.github.com/repos/jgm/pandoc/releases/$VERSION/assets?name=$FULLNAME.pkg.zip"
 
 curl -H "Authorization: token $TOKEN" \
      -H "Accept: application/vnd.github.manifold-preview" \

diff --git a/googlecode-upload.sh b/googlecode-upload.sh
@@ -2,4 +2,4 @@
 VERSION=$1
 googlecode_upload.py -s "Source tarball" -p pandoc -u fiddlosopher --labels=Featured,Type-Source,OpSys-All  dist/pandoc-$VERSION.tar.gz
 googlecode_upload.py -s "Windows installer" -p pandoc -u fiddlosopher --labels=Featured,Type-Installer,OpSys-Windows  pandoc-$VERSION.msi
-googlecode_upload.py -s "Mac OS X installer" -p pandoc -u fiddlosopher --labels=Featured,Type-Installer,OpSys-OSX  pandoc-$VERSION.dmg
+googlecode_upload.py -s "Mac OS X installer" -p pandoc -u fiddlosopher --labels=Featured,Type-Installer,OpSys-OSX  pandoc-$VERSION.pkg.zip
diff --git a/make_osx_package.sh b/make_osx_package.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 DIST=`pwd`/osx_package
 SANDBOX=`pwd`/.cabal-sandbox
@@ -13,6 +13,9 @@ CODESIGNID="Developer ID Application: John Macfarlane"
 PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
 EXES="pandoc pandoc-citeproc biblio2yaml"
 
+read -s -p "sudo password: " PASSWORD
+echo $PASSWORD | sudo -S echo "Password valid, continuing."
+
 echo Removing old files...
 rm -rf $DIST
 mkdir -p $RESOURCES
@@ -50,6 +53,8 @@ codesign --force --sign "$CODESIGNID" $DEST/bin/pandoc
 spctl --assess --type execute $DEST/bin/pandoc
 
 echo Creating OSX package...
+# remove old package first
+echo $PASSWORD | sudo -S rm -rf $BASE.pkg $BASE.dmg
 
 sudo $PACKAGEMAKER \
     --root $ROOT \
@@ -67,11 +72,13 @@ sudo codesign --force --sign "$CODESIGNID" $BASE.pkg
 # make sure it's valid...
 spctl --assess --type install $BASE.pkg
 
-echo Creating disk image...
+echo Creating zip...
+zip -9 -r $BASE.pkg.zip $BASE.pkg
 
-sudo hdiutil create "$BASE.dmg" \
-    -format UDZO -ov \
-    -volname "pandoc $VERSION" \
-    -srcfolder $BASE.pkg
-sudo hdiutil internet-enable "$BASE.dmg"
+# echo Creating disk image...
+# sudo hdiutil create "$BASE.dmg" \
+#     -format UDZO -ov \
+#     -volname "pandoc $VERSION" \
+#     -srcfolder $BASE.pkg
+# sudo hdiutil internet-enable "$BASE.dmg"