bin/nixenvironment in nixenvironment-0.0.64 vs bin/nixenvironment in nixenvironment-0.0.65
- old
+ new
@@ -105,11 +105,11 @@
raise 'Failed read_config_settings!' unless Xcodebuild.last_cmd_success?
rescue => e
error('Build error!', e)
end
- @config_settings.merge!(Xcodebuild.config_settings)
+ @config_settings.merge!(Xcodebuild.config_settings) { |_key, v1, v2| v1 || v2 }
begin
prebuild(options.config)
build(options.config, options.ipa, options.ndsym, options.icon_tagger)
ensure
@@ -707,7 +707,7 @@
abort "#{msg} #{e.to_s.strip}".red.on_yellow.bold
end
def success(msg)
- puts msg.green.on_blue.bold
+ puts msg.green.bold
end
\ No newline at end of file