lib/omnibus/packagers/pkg.rb in omnibus-7.0.34 vs lib/omnibus/packagers/pkg.rb in omnibus-8.0.9
- old
+ new
@@ -422,22 +422,22 @@
def is_binary?(bin)
is_binary = File.file?(bin) &&
File.executable?(bin) &&
!File.symlink?(bin)
- log.debug(log_key) { " removing from signing: #{bin}" } unless is_binary
+ log.debug(log_key) { " removing non-binary file from signing: #{bin}" } unless is_binary
is_binary
end
def is_macho?(lib)
is_macho = false
if is_binary?(lib)
command = "file #{lib}"
stdout = shellout!(command).stdout
- is_macho = stdout.match?(/Mach-O.*library/) || stdout.match?(/Mach-O.*bundle/)
+ is_macho = stdout.match?(/Mach-O.*(library|bundle)/)
end
- log.debug(log_key) { " removing from signing: #{lib}" } unless is_macho
+ log.debug(log_key) { " removing non-Mach-O library file from signing: #{lib}" } unless is_macho
is_macho
end
end
end