aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-11-09 18:39:58 +0000
committerGerald Combs <gerald@wireshark.org>2013-11-09 18:39:58 +0000
commitc7f980342ee1550ee87869a96364f8f0151c89d3 (patch)
tree62b815b737242ea7e8cfec5a3fe5a932c95b2ab3 /packaging
parent7f3dd7b4994418cc56557f2c8ab78f18922a5ea5 (diff)
Try to simplify package signing.
According to the packagemaker man page, '--target 10.5' will produce a flat package. Use it instead of pkgutil. svn path=/trunk/; revision=53201
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/macosx/osx-dmg.sh.in8
1 files changed, 2 insertions, 6 deletions
diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in
index 9eef2b2999..02dfbf8808 100755
--- a/packaging/macosx/osx-dmg.sh.in
+++ b/packaging/macosx/osx-dmg.sh.in
@@ -153,18 +153,14 @@ rm -rf "$pkg_file"
packagemaker --doc "Wireshark_package.pmdoc" \
--title "$pkg_title" \
--version "$version" \
+ --target 10.5 \
--verbose || exit 1
if [ -n "$CODE_SIGN_IDENTITY" ] ; then
- pkg_dir_unsigned="$pkg_title UNSIGNED"
- pkg_file_unsigned="$pkg_title_unsigned.pkg"
- pkg_file_flattened="$pkg_title FLATTENED.pkg"
+ pkg_file_unsigned="$pkg_title UNSIGNED.pkg"
echo -e "Signing $pkg_file"
mv "$pkg_file" "$pkg_file_unsigned" || exit 1
- pkgutil --expand "$pkg_file_unsigned" "$pkg_dir_unsigned" || exit 1
- pkgutil --flatten "$pkg_file_unsigned" "$pkg_file_flattened" || exit 1
-
productsign --sign "$CODE_SIGN_IDENTITY" --force --verbose "$pkg_file_flattened" "$pkg_file" || exit 1
spctl --assess --type install "$pkg_file" || exit 1
shasum "$pkg_file"