Skip to content

Commit 46ee74a

Browse files
authored
fix: remove docker-compose.redis_extra.yaml properly (#52)
1 parent 59151bf commit 46ee74a

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

install.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,24 @@ post_install_actions:
3131
#ddev-description:Remove redis/scripts if there are no files
3232
rmdir redis/scripts 2>/dev/null || true
3333
- |
34-
#ddev-nodisplay
3534
#ddev-description:Remove old `redis` command from `ddev-redis-7`
3635
if grep "#ddev-generated" $DDEV_APPROOT/.ddev/commands/redis/redis > /dev/null 2>&1; then
3736
rm -f "$DDEV_APPROOT/.ddev/commands/redis/redis"
3837
fi
3938
4039
removal_actions:
4140
- |
42-
#ddev-description:Remove redis settings for Drupal 9+ if applicable
43-
rm -f "${DDEV_APPROOT}/${DDEV_DOCROOT}/sites/default/settings.ddev.redis.php"
41+
#ddev-description:Remove redis settings if applicable
42+
files=(
43+
"${DDEV_APPROOT}/${DDEV_DOCROOT}/sites/default/settings.ddev.redis.php"
44+
"${DDEV_APPROOT}/.ddev/docker-compose.redis_extra.yaml"
45+
)
46+
for file in "${files[@]}"; do
47+
if [ -f "$file" ]; then
48+
if grep -q '#ddev-generated' "$file"; then
49+
rm -f "$file"
50+
else
51+
echo "Unwilling to remove '$file' because it does not have #ddev-generated in it; you can manually delete it if it is safe to delete."
52+
fi
53+
fi
54+
done

0 commit comments

Comments
 (0)