Don't assume that, in the output of the file command, the architecture

appears at the end - if the user's installed an up-to-date version of
file to, for example, get pcap-ng files identified (Apple hasn't updated
file in *ages* - they're still in file 5.04!), it will report, for
example, "Mach-O 64-bit x86_64 executable" rather than "Mach-O 64-bit
executable x86_64" for an x86-64 binary.

svn path=/trunk/; revision=46954

diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in
index 30971fceba2cf6fa58dcb312cbe1329c85138f3f..07ecf30a032552730d823d520046d3933780589f 100755 (executable)
--- a/packaging/macosx/osx-dmg.sh.in
+++ b/packaging/macosx/osx-dmg.sh.in
@@ -103,16 +103,16 @@ fi
 
 # Get the architecture
 case `file $ws_bin` in
 
 # Get the architecture
 case `file $ws_bin` in

-       *Mach-O*64-bit*x86_64)
+       *Mach-O*64-bit*x86_64*)

                architecture="Intel 64"
                ;;
                architecture="Intel 64"
                ;;

-       *Mach-O*i386)
+       *Mach-O*i386*)

                architecture="Intel 32"
                ;;
                architecture="Intel 32"
                ;;

-       *Mach-O*ppc64)
+       *Mach-O*ppc64*)

                architecture="PPC 64"
                ;;
                architecture="PPC 64"
                ;;

-       *Mach-O*ppc)
+       *Mach-O*ppc*)

                architecture="PPC 32"
                ;;
        *)
                architecture="PPC 32"
                ;;
        *)