From a2612e5ee65d112c1ea8120d5d81474b7f0145b9 Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Thu, 6 Aug 2020 10:47:40 +0200 Subject: [PATCH] provision_container: Fixes for new WissKI version --- .../compose/barrel/scripts/provision_container.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/distillery/resources/compose/barrel/scripts/provision_container.sh b/distillery/resources/compose/barrel/scripts/provision_container.sh index 3e25bc7..d191779 100644 --- a/distillery/resources/compose/barrel/scripts/provision_container.sh +++ b/distillery/resources/compose/barrel/scripts/provision_container.sh @@ -93,6 +93,16 @@ else composer require 'drupal/wisski:2.x-dev' fi +# Install dependencies of WissKI +log_info " => Installing and patching Wisski dependencies" +pushd "$WEB_DIR/modules/contrib/wisski" +composer install + +# Patch EasyRDF (for now) +EASYRDF_RESPONSE="./vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Response.php" +patch -N "$EASYRDF_RESPONSE" < "/patch/easyrdf.patch" +popd + drupal_sites_permission_workaround composer require drupal/inline_entity_form @@ -109,11 +119,6 @@ log_info " => Enable Wisski modules" drush pm-enable --yes wisski_core wisski_linkblock wisski_pathbuilder wisski_adapter_sparql11_pb wisski_salz drupal_sites_permission_workaround -# Because of a regresssion in EasyRDF and Tomcat, we need to manually patch EasyRDF -EASYRDF_RESPONSE="$COMPOSER_DIR/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Response.php" -log_info " => Patching '$EASYRDF_RESPONSE'" -patch "$EASYRDF_RESPONSE" < "/patch/easyrdf.patch" - log_info " => Provisioning is now complete. " log_ok "Your installation details are as follows:" function printdetails() {