Merge branch 'main' into i205-collection-thumbnail-rework

samvera · May 29, 2024 · 1bfcccb · 1bfcccb
2 parents 2601847 + ec7566e
commit 1bfcccb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/config/initializers/good_job.rb b/config/initializers/good_job.rb
@@ -6,7 +6,7 @@
  # Configure options individually...
  config.good_job.preserve_job_records = true
  config.good_job.retry_on_unhandled_error = false
- config.good_job.on_thread_error = ->(exception) { Raven.capture_exception(exception) }
+ config.good_job.on_thread_error = ->(exception) { Sentry.capture_exception(exception) }
  config.good_job.execution_mode = :external
  # config.good_job.queues = '*'
  config.good_job.shutdown_timeout = 60 # seconds

diff --git a/package.json b/package.json
@@ -7,8 +7,9 @@
  },
  "scripts": {
  "preinstall": "rm -rf ./public/uv",
- "postinstall": "yarn run uv-install && yarn run uv-config",
+ "postinstall": "yarn run uv-install && yarn run uv-config && yarn run knapsack-uv-config",
  "uv-install": "cp -r ./node_modules/universalviewer/dist ./public/uv",
- "uv-config": "cp ./config/uv/uv.html ./public/uv/uv.html & cp ./config/uv/uv-config.json ./public/uv/"
+ "uv-config": "cp ./config/uv/uv.html ./public/uv/uv.html & cp ./config/uv/uv-config.json ./public/uv/",
+ "knapsack-uv-config": "if [ $(ls -A ../config/uv/ 2>/dev/null | wc -l) -gt 0 ]; then cp -r ../config/uv/* ./public/uv/; fi"
  }
 }