osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

macOS: Name our .dmgs according to our architecture. 

In osx-dmg.sh, add "ARM 64" or "Intel 64" to our .dmg name depending on
the architecture of Wireshark.app/Contents/MacOS/Wireshark.
This commit is contained in:
Gerald Combs 2021-05-30 10:02:20 -07:00 committed by Wireshark GitLab Utility
parent f4e18241b9
commit a714805628
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packaging/macosx/osx-dmg.sh.in
View File

@ -8,7 +8,7 @@ set -e
dmgbuild="@DMGBUILD_EXECUTABLE@"
version="@VERSION@"
settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/dmgbuild-settings.py"
architecture="Intel 64"
architecture=""
# Help message
#----------------------------------------------------------
@ -34,6 +34,15 @@ if [ ! -x "$dmgbuild" ] ; then
exit 1
fi
if lipo Wireshark.app/Contents/MacOS/Wireshark -verify_arch arm64e ; then
architecture="ARM 64"
elif lipo Wireshark.app/Contents/MacOS/Wireshark -verify_arch x86_64 ; then
architecture="Intel 64"
else
echo "Error: Wireshark.app missing or has unknown architecture."
exit 1
fi
# Parse command line arguments
while [ "$1" != "" ]
do