Merge branch 'master' into 3654-combine-selections

[arvados.git] / docker / build_tools / config.rb

diff --git a/docker/build_tools/config.rb b/docker/build_tools/config.rb
index cee72cf85b49bcca03af6c7fabc1338a49dadce8..d8bf256124eeeb387f6af39128b47b4ab35f9aac 100755 (executable)
--- a/docker/build_tools/config.rb
+++ b/docker/build_tools/config.rb
@@ -40,9 +40,7 @@ else
   globdir = '*'
 end
 
-Dir.glob(globdir + '/generated/*') do |stale_file|
-  File.delete(stale_file)
-end
+FileUtils.rm_r Dir.glob(globdir + '/generated/*')
 
 File.umask(022)
 Dir.glob(globdir + '/*.in') do |template_file|
@@ -51,8 +49,6 @@ Dir.glob(globdir + '/*.in') do |template_file|
   output_path = File.join(generated_dir, File.basename(template_file, '.in'))
   output_mode = (File.stat(template_file).mode & 0100) ? 0755 : 0644
   File.open(output_path, "w", output_mode) do |output|
-    # Set the mode again after opening, to thwart any prevailing umask:
-    output.chmod output_mode
     File.open(template_file) do |input|
       input.each_line do |line|