diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-01-05 23:07:05 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-01-05 23:07:05 +0000 |
| commit | a70b2c5208d2e65a35268dff0681c3df731024d3 (patch) | |
| tree | 99cd01127bcd1c693d774e1a4cc49c72d0cb5732 /packaging | |
| parent | d8dfa8597f5701246d944c28f2be664f859fe88c (diff) | |
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
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/osx-dmg.sh.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in index 30971fceba..07ecf30a03 100755 --- 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 - *Mach-O*64-bit*x86_64) + *Mach-O*64-bit*x86_64*) architecture="Intel 64" ;; - *Mach-O*i386) + *Mach-O*i386*) architecture="Intel 32" ;; - *Mach-O*ppc64) + *Mach-O*ppc64*) architecture="PPC 64" ;; - *Mach-O*ppc) + *Mach-O*ppc*) architecture="PPC 32" ;; *) |