diff --git a/install.zsh b/install.zsh index 77fd8b0..c298512 100755 --- a/install.zsh +++ b/install.zsh @@ -276,6 +276,10 @@ function at-repos-patch-apply-all() { repo="atproto" elif [[ $filename == *"feed"* ]]; then repo="feed-generator" + # feed-generatorパッチ適用前に既存のDockerfileを削除(upstreamと競合回避) + if [[ $filename == "200-feed-generator-custom.patch" ]]; then + rm -f "$d/repos/feed-generator/Dockerfile" + fi fi patch-apply "$title" "$repo" "$filename"