X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/32cecc78ad532393ba0f1b3e80db850dc33bf4b5..e5f039f2e451790ff3838c5810a22a0749d18f6d:/docker/build_tools/config.rb

diff --git a/docker/build_tools/config.rb b/docker/build_tools/config.rb
index cee72cf85b..296bc206ff 100755
--- 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|
 
@@ -76,12 +72,3 @@ Dir.glob(globdir + '/*.in') do |template_file|
     end
   end
 end
-
-# Copy the ssh public key file to base/generated (if a path is given)
-generated_dir = File.join('base/generated')
-Dir.mkdir(generated_dir) unless Dir.exists? generated_dir
-if (!config['PUBLIC_KEY_PATH'].nil? and
-    File.readable? config['PUBLIC_KEY_PATH'])
-  FileUtils.cp(config['PUBLIC_KEY_PATH'],
-               File.join(generated_dir, 'id_rsa.pub'))
-end