Fix regex to work on OSX's file(1)

egypt · egypt · commit 55147d9bdea8 · 2013-08-06T14:00:35.000-05:00
diff --git a/spec/support/shared/contexts/msf/util/exe.rb b/spec/support/shared/contexts/msf/util/exe.rb
@@ -32,7 +32,7 @@
     "osx" => [
       { :format => "macho", :arch => "x86",   :file_fp => /Mach-O.*i386/  },
       { :format => "macho", :arch => "x64",   :file_fp => /Mach-O 64/     },
-      { :format => "macho", :arch => "armle", :file_fp => /Mach-O.*acorn/ },
+      { :format => "macho", :arch => "armle", :file_fp => /Mach-O.*(acorn|arm)/ },
       { :format => "macho", :arch => "ppc",   :file_fp => /Mach-O.*ppc/   },
     ],
   }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`"osx" => [`
`33`	`33`	`{ :format => "macho", :arch => "x86", :file_fp => /Mach-O.*i386/ },`
`34`	`34`	`{ :format => "macho", :arch => "x64", :file_fp => /Mach-O 64/ },`
`35`		`- { :format => "macho", :arch => "armle", :file_fp => /Mach-O.*acorn/ },`
	`35`	`+ { :format => "macho", :arch => "armle", :file_fp => /Mach-O.*(acorn\|arm)/ },`
`36`	`36`	`{ :format => "macho", :arch => "ppc", :file_fp => /Mach-O.*ppc/ },`
`37`	`37`	`],`
`38`	`38`	`}`