Prowlarr/Indexers
1
0
Fork 0
mirror of https://github.com/Prowlarr/Indexers.git synced 2026-02-14 23:19:03 +00:00
Code Activity

Fix indexer-sync prevent overriding Prowlarr .github files

Browse Source
This commit is contained in:
ineednewpajamas
2026-02-02 19:04:19 -06:00
committed by Auggie
parent d7f6724861
commit 87c4782085
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/indexer-sync-v2.sh
View File

@@ -612,7 +612,7 @@ pull_cherry_and_merge() {
# Remove unwanted file types that Jackett might have added
# Explicitly exclude important repository files and schema files
unwanted_files=$(git diff --cached --name-only | grep -E "$CONFLICTS_NONYML_EXTENSIONS" | grep -v -E '^(README\.md|CONTRIBUTING\.md|LICENSE\.md)$' | grep -v 'schema\.json$' || true)
unwanted_files=$(git diff --cached --name-only | grep -E "$CONFLICTS_NONYML_EXTENSIONS" | grep -v -E '^(README\.md|CONTRIBUTING\.md|LICENSE\.md)$' | grep -v 'schema\.json$' | grep -v -E '^\.github' || true)
if [ -n "$unwanted_files" ]; then
log "INFO" "Removing unwanted file types from Jackett"
echo "$unwanted_files" | while IFS= read -r file; do
@@ -629,6 +629,19 @@ pull_cherry_and_merge() {
fi
done
# Always use Prowlarr's version of .github repository files
github_files=$(find .github -type f 2>/dev/null)
if [ -n "$github_files" ]; then
for github_file in $github_files; do
if git diff --cached --name-only | grep -q "^${github_file}$"; then
log "DEBUG" "Ensuring Prowlarr version of $github_file is used"
git checkout HEAD -- "$github_file" 2>/dev/null || true
fi
done
else
log "DEBUG" "No .github files found to checkout"
fi
# Also remove any src/ directories that might have been added
src_files=$(git diff --cached --name-only | grep '^src/' || true)
if [ -n "$src_files" ]; then
@@ -691,8 +704,9 @@ resolve_conflicts() {
readme_conflicts=$(echo "$conflicted_files" | grep -E '^README\.md$' || true)
# Explicitly exclude important repository files and schema files from nonyml conflicts
nonyml_conflicts=$(echo "$conflicted_files" | grep -E "$CONFLICTS_NONYML_EXTENSIONS" | grep -v -E '^(README\.md|CONTRIBUTING\.md|LICENSE\.md)$' | grep -v 'schema\.json$' || true)
yml_conflicts=$(echo "$conflicted_files" | grep -E '\.ya?ml$' || true)
yml_conflicts=$(echo "$conflicted_files" | grep -E '\.ya?ml$' | grep -v -E '^\.github' || true)
schema_conflicts=$(echo "$conflicted_files" | grep -E '\.schema\.json$' || true)
github_conflicts=$(echo "$conflicted_files" | grep -E '^\.github' || true)
log "WARN" "conflicts exist"
if [ -n "$readme_conflicts" ]; then
@@ -701,6 +715,16 @@ resolve_conflicts() {
git add --force README.md
fi
if [ -n "$github_conflicts" ]; then
log "DEBUG" ".github conflict exists; using Prowlarr files"
for gh_file in $github_conflicts; do
if git ls-files | grep -q "^$gh_file$"; then
git checkout --ours "$gh_file" 2>/dev/null || true
git add --force "$gh_file" 2>/dev/null || true
fi
done
fi
if [ -n "$schema_conflicts" ]; then
log "DEBUG" "Schema conflict exists; using Prowlarr schema"
for file in $schema_conflicts; do