From b04e9c17f93ad05fcd9d95530b8c43a0e658fff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 19 Oct 2023 13:21:02 -0400 Subject: [PATCH 1/2] Add straggler script i added to docs but not here --- scripts/retain-custom-htaccess.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 scripts/retain-custom-htaccess.sh diff --git a/scripts/retain-custom-htaccess.sh b/scripts/retain-custom-htaccess.sh new file mode 100755 index 0000000..41dd644 --- /dev/null +++ b/scripts/retain-custom-htaccess.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +if [ -f ./web/.htaccess.custom ] +then + cd web && mv .htaccess .htaccess.default && cp .htaccess.custom .htaccess + git diff -s --exit-code .htaccess.default || echo 'NOTE: .htaccess.default file has changed! Be sure to integrate latest updates into .htaccess and .htaccess.custom, then commit all three files. For example, meld web/.htaccess.custom web/.htaccess.default' +fi From 97a9ba1c23c50fc340221d64de05b5afc5207045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 19 Oct 2023 13:21:08 -0400 Subject: [PATCH 2/2] Update composer lock --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 51c2c0b..9805774 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "62318b0dffdbca25b349863cf75ea367", + "content-hash": "197c6f07c2e08a57fd28c0f12b8d438b", "packages": [ { "name": "abraham/twitteroauth",