From b722f9f4ea86fa7eefd37c6ab854628c43a088cd Mon Sep 17 00:00:00 2001 From: Valentin Date: Sat, 30 Nov 2024 01:59:13 +0100 Subject: [PATCH] correction loop snapshot collection name --- bin/add-site/install_directus.sh | 7 ++----- bin/first_install.sh | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bin/add-site/install_directus.sh b/bin/add-site/install_directus.sh index 0034038..04c203c 100644 --- a/bin/add-site/install_directus.sh +++ b/bin/add-site/install_directus.sh @@ -86,8 +86,7 @@ if [[ "$answer" == "y" ]]; then can_see_policy_id=$(docker exec -i "${DOMAIN_NAME}_Directus_DB" mariadb -N -uroot -e "SELECT id FROM directus.directus_policies WHERE name='CanSee'") can_edit_policy_id=$(docker exec -i "${DOMAIN_NAME}_Directus_DB" mariadb -N -uroot -e "SELECT id FROM directus.directus_policies WHERE name='CanEdit'") - docker exec -i "${DOMAIN_NAME}_Directus_DB" sh -c "mariadb -N -u root directus -e \"SELECT collection FROM directus_collections;\"" | while read collection_name; do - echo $collection_name; + while read collection_name; do docker exec -i "${DOMAIN_NAME}_Directus_DB" sh -c " mariadb -uroot directus -e \" INSERT INTO directus_permissions (collection, action, permissions, fields, policy) @@ -99,9 +98,7 @@ if [[ "$answer" == "y" ]]; then ('${collection_name}', 'delete', '{}', '*', '${can_edit_policy_id}'); \" " - done - # @TODO: check set permissions for collections imported via schema - + done < <(docker exec -i "${DOMAIN_NAME}_Directus_DB" sh -c "mariadb -N -u root directus -e \"SELECT collection FROM directus_collections;\"") fi if ! grep -q "cms.${DOMAIN_NAME}" "$CADDYFILE"; then diff --git a/bin/first_install.sh b/bin/first_install.sh index 63ffa76..7d4b493 100644 --- a/bin/first_install.sh +++ b/bin/first_install.sh @@ -28,10 +28,10 @@ fi # Check if Docker is installed if ! command -v docker &> /dev/null; then - echo "${ORANGE}${BOLD}Docker is not installed.${RESET}" + echo -e "${ORANGE}${BOLD}Docker is not installed.${RESET}" exit 1 else - echo "${BLUE}${BOLD}Docker is installed.${RESET}" + echo -e "${BLUE}${BOLD}Docker is installed.${RESET}" fi