Merge pull request #30 from noir-neo/fix-install-path

Modify install path mac

pkg-info.plist

@@ -17,11 +17,11 @@
 				<key>BundleOverwriteAction</key>
 				<string></string>
 				<key>RootRelativeBundlePath</key>
-				<string>Applications/hatbor.app/Contents/PlugIns/StandaloneFileBrowser.bundle</string>
+				<string>hatbor.app/Contents/PlugIns/StandaloneFileBrowser.bundle</string>
 			</dict>
 		</array>
 		<key>RootRelativeBundlePath</key>
-		<string>Applications/hatbor.app</string>
+		<string>hatbor.app</string>
 	</dict>
 </array>
 </plist>

post-process-build-mac.sh

@@ -13,18 +13,19 @@ codesign \
   --entitlements "${PROJECT_NAME}.entitlements" \
   --sign "Developer ID Application: ${APPLE_TEAM_NAME} (${APPLE_TEAM_ID})" "${MAC_BUILD_PATH}/${PROJECT_NAME}.app"
 
-mkdir -p "pkgroot/Applications"
-cp -R "${MAC_BUILD_PATH}/${PROJECT_NAME}.app" "pkgroot/Applications/${PROJECT_NAME}.app"
+rm -rf "pkgroot"
+mkdir -p "pkgroot"
+cp -R "${MAC_BUILD_PATH}/${PROJECT_NAME}.app" "pkgroot/${PROJECT_NAME}.app"
 
 pkgbuild --root "pkgroot" --component-plist "pkg-info.plist" --identifier ${BUNDLE_IDENTIFIER} --version ${VERSION} --install-location "/Applications" "${PROJECT_NAME}.pkg"
 
 productbuild --synthesize --package "${PROJECT_NAME}.pkg" "Distribution.xml"
 productbuild --distribution "Distribution.xml" --package-path . "distribution.pkg"
 
-productsign --sign "Developer ID Installer: ${APPLE_TEAM_NAME} (${APPLE_TEAM_ID})" "distribution.pkg" "signed.pkg"
+rm -rf "dmg-resources"
+mkdir "dmg-resources"
+productsign --sign "Developer ID Installer: ${APPLE_TEAM_NAME} (${APPLE_TEAM_ID})" "distribution.pkg" "dmg-resources/${PROJECT_NAME}.pkg"
 
-mkdir dmg-resources
-cp "signed.pkg" "dmg-resources/${PROJECT_NAME}.pkg"
 hdiutil create -srcfolder "dmg-resources" -fs HFS+ -format UDZO -volname "${PROJECT_NAME}" "${PROJECT_NAME}.dmg"
 
 xcrun notarytool store-credentials "APP_PASSWORD_NOTARIZATION" --apple-id "${APPLE_ID}" --team-id "${APPLE_TEAM_ID}" --password "${APPLE_PASSWORD}"