install.rb: generate config.yml file on demand if necessary. Refs #2221.

[arvados.git] / docker / config.rb

diff --git a/docker/config.rb b/docker/config.rb
index 5e7242b4d50a23eeeabbc55daab684c94e8f9e6e..ae69fe29eceb2f51fb87efc0d1e91069b3d98c77 100755 (executable)
--- a/docker/config.rb
+++ b/docker/config.rb
@@ -64,9 +64,8 @@ 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.key?('PUBLIC_KEY_PATH') &&
-    ! (config['PUBLIC_KEY_PATH'] == '') &&
-    File.readable?(config['PUBLIC_KEY_PATH'])
+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