Merge pull request #2055 from samvera/avoid-present-call-in-non-rails…

…-situation 🧹 Avoid `#present?` in non-Rails situations
samvera · Dec 15, 2023 · 553dec5 · 553dec5
2 parents 5177c95 + 8b64bf8
commit 553dec5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/bin/web b/bin/web
@@ -1,5 +1,5 @@
 #!/usr/local/bin/ruby
 # frozen_string_literal: true
-`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].present?
+`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` unless ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].to_s.strip.empty?
 
 exec "bundle exec puma -v -b tcp://0.0.0.0:3000"
diff --git a/bin/worker b/bin/worker
@@ -1,11 +1,11 @@
 #!/usr/local/bin/ruby
 # frozen_string_literal: true
-`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].present?
+`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` unless ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].to_s.strip.empty?
 
-if ENV['DATABASE_URL'].present?
-  ENV['DATABASE_URL'] = ENV['DATABASE_URL'].gsub('pool=5', 'pool=30')
-else
+if ENV['DATABASE_URL'].to_s.strip.empty?
   puts 'DATABASE_URL not set, no pool change needed'
+else
+  ENV['DATABASE_URL'] = ENV['DATABASE_URL'].gsub('pool=5', 'pool=30')
 end
 
 queue = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')