[Automated] Merged master into target k8s

department-of-veterans-affairs · Apr 23, 2024 · bbe055b · bbe055b
2 parents 9cf9721 + 7233ff1
commit bbe055b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/ivc_champva/lib/tasks/forms.rake b/modules/ivc_champva/lib/tasks/forms.rake
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-PDFTK_HOMEBREW_PATH = '/opt/homebrew/bin/pdftk'
-PDFTK_LOCAL_PATH    = '/usr/local/bin/pdftk'
+PDFTK_HOMEBREW_PATH = '/opt/homebrew/bin/pdftk' unless defined?(PDFTK_HOMEBREW_PATH)
+PDFTK_LOCAL_PATH    = '/usr/local/bin/pdftk' unless defined?(PDFTK_LOCAL_PATH)
 MODELS_PATH = 'modules/ivc_champva/app/models/ivc_champva'
 MAPPINGS_PATH = 'modules/ivc_champva/app/form_mappings'
 

diff --git a/modules/simple_forms_api/lib/tasks/forms.rake b/modules/simple_forms_api/lib/tasks/forms.rake
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-PDFTK_HOMEBREW_PATH = '/opt/homebrew/bin/pdftk'
-PDFTK_LOCAL_PATH    = '/usr/local/bin/pdftk'
+PDFTK_HOMEBREW_PATH = '/opt/homebrew/bin/pdftk' unless defined?(PDFTK_HOMEBREW_PATH)
+PDFTK_LOCAL_PATH    = '/usr/local/bin/pdftk' unless defined?(PDFTK_LOCAL_PATH)
 SIMPLE_FORMS_API_MODELS_PATH = 'modules/simple_forms_api/app/models/simple_forms_api'
 SIMPLE_FORMS_API_MAPPINGS_PATH = 'modules/simple_forms_api/app/form_mappings'