From 961f89437281b2260f8e1068ea65b3d7aef8b484 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sat, 25 Mar 2023 09:56:34 +0100 Subject: [PATCH 1/2] adjust wording of regex for NEXTCLOUD_DATADIR Signed-off-by: Simon L --- Containers/mastercontainer/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containers/mastercontainer/start.sh b/Containers/mastercontainer/start.sh index 8aade3ab..6ec4e9ae 100644 --- a/Containers/mastercontainer/start.sh +++ b/Containers/mastercontainer/start.sh @@ -98,7 +98,7 @@ if [ -n "$NEXTCLOUD_DATADIR" ]; then echo "NEXTCLOUD_DATADIR is set to $NEXTCLOUD_DATADIR" elif ! echo "$NEXTCLOUD_DATADIR" | grep -q "^/" || [ "$NEXTCLOUD_DATADIR" = "/" ]; then echo "You've set NEXTCLOUD_DATADIR but not to an allowed value. -The string must start with '/' and must not be equal to '/'. +The string must start with '/' and must not be equal to '/'. Also allowed is 'nextcloud_aio_nextcloud_datadir'. It is set to '$NEXTCLOUD_DATADIR'." exit 1 fi From bf9482e5608d7c6cfe12c67ffdd51854918c175a Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 26 Mar 2023 14:46:22 +0200 Subject: [PATCH 2/2] Make sure that NEXTCLOUD_DATADIR is not misleading Signed-off-by: Simon L --- Containers/mastercontainer/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containers/mastercontainer/start.sh b/Containers/mastercontainer/start.sh index 6ec4e9ae..650112db 100644 --- a/Containers/mastercontainer/start.sh +++ b/Containers/mastercontainer/start.sh @@ -95,7 +95,7 @@ fi # Check for other options if [ -n "$NEXTCLOUD_DATADIR" ]; then if [ "$NEXTCLOUD_DATADIR" = "nextcloud_aio_nextcloud_datadir" ]; then - echo "NEXTCLOUD_DATADIR is set to $NEXTCLOUD_DATADIR" + sleep 1 elif ! echo "$NEXTCLOUD_DATADIR" | grep -q "^/" || [ "$NEXTCLOUD_DATADIR" = "/" ]; then echo "You've set NEXTCLOUD_DATADIR but not to an allowed value. The string must start with '/' and must not be equal to '/'. Also allowed is 'nextcloud_aio_nextcloud_datadir'.