projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.curoverse.com:arvados into 2638-add-cache-age-disk-usage...
[arvados.git]
/
docker
/
build_tools
/
config.rb
diff --git
a/docker/build_tools/config.rb
b/docker/build_tools/config.rb
index 7acb888419d9a71ee3656abd66c6a11c52dc4c14..ddf923736e87f2d6b570478a88ad46b7f415223a 100755
(executable)
--- a/
docker/build_tools/config.rb
+++ b/
docker/build_tools/config.rb
@@
-67,7
+67,7
@@
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
# 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
+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'))
File.readable? config['PUBLIC_KEY_PATH'])
FileUtils.cp(config['PUBLIC_KEY_PATH'],
File.join(generated_dir, 'id_rsa.pub'))