From e207496229723b7e237e662ed8f7e99c38133e98 Mon Sep 17 00:00:00 2001 From: Tom Date: Tue, 4 Jul 2023 13:27:29 +0200 Subject: [PATCH] Properly name the fontawesome script --- .../instances/runtime/install_colorbox.sh | 4 +--- ...install_fontawesome.sh => local_fontawesome.sh} | 14 +++++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) rename internal/dis/component/instances/runtime/{install_fontawesome.sh => local_fontawesome.sh} (57%) diff --git a/internal/dis/component/instances/runtime/install_colorbox.sh b/internal/dis/component/instances/runtime/install_colorbox.sh index 9e1209a..99b95ce 100644 --- a/internal/dis/component/instances/runtime/install_colorbox.sh +++ b/internal/dis/component/instances/runtime/install_colorbox.sh @@ -4,6 +4,7 @@ set -e # make a temporary directory and cd into it TEMPDIR=$(mktemp -d) pushd "$TEMPDIR" +trap 'popd && rm -rf $TEMPDIR' EXIT # curl the colorbox zip and unpack it curl -L https://github.com/jackmoore/colorbox/archive/master.zip --output master.zip @@ -17,6 +18,3 @@ rm -rf /var/www/data/project/web/sites/default/libraries/colorbox # copy over the new installation mv colorbox-master/ /var/www/data/project/web/sites/default/libraries/colorbox -# cleanup -popd -rm -rf "$TEMPDIR" diff --git a/internal/dis/component/instances/runtime/install_fontawesome.sh b/internal/dis/component/instances/runtime/local_fontawesome.sh similarity index 57% rename from internal/dis/component/instances/runtime/install_fontawesome.sh rename to internal/dis/component/instances/runtime/local_fontawesome.sh index 4a62754..c863169 100644 --- a/internal/dis/component/instances/runtime/install_fontawesome.sh +++ b/internal/dis/component/instances/runtime/local_fontawesome.sh @@ -1,9 +1,16 @@ #!/bin/bash set -e +FAINFO=`drush pm-list --pipe --type=module --filter=id=fontawesome` +if [[ -z "$FAINFO" ]]; then + echo "Font Awesome is not installed, aborting" + exit 0 +fi + # make a temporary directory and cd into it TEMPDIR=$(mktemp -d) pushd "$TEMPDIR" +trap 'popd && rm -rf $TEMPDIR' EXIT # curl the colorbox zip and unpack it curl -L https://use.fontawesome.com/releases/v6.4.0/fontawesome-free-6.4.0-web.zip --output fontawesome.zip @@ -17,6 +24,7 @@ rm -rf /var/www/data/project/web/libraries/fontawesome # Move over the fontawesome zip file mv fontawesome-* /var/www/data/project/web/libraries/fontawesome -# cleanup -popd -rm -rf "$TEMPDIR" +# Update drush config to use local fontawesome +drush config:set --yes --input-format=yaml fontawesome.settings use_cdn false +drush config:set --yes --input-format=yaml fontawesome.settings use_shim false +drush cr \ No newline at end of file