Prowlarr/Indexers
1
0
Fork 0
mirror of https://github.com/Prowlarr/Indexers.git synced 2025-12-26 22:19:47 +00:00
Code Activity

Fixed: handle both-added definition conflicts

Browse Source
This commit is contained in:
ServarrAdmin
2025-08-16 09:55:23 -05:00
parent f388a094f5
commit ff1dd7a22f
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -590,6 +590,17 @@ resolve_conflicts() {
done done
fi fi
# Handle "both added" definition files (when Git auto-moves files from Jackett paths)
both_added_defs=$(git status --porcelain | grep "^AA" | grep "definitions/v[0-9].*\.yml$" | awk '{print $2}')
if [ -n "$both_added_defs" ]; then
log "DEBUG" "Both added definition conflicts exist; using Jackett's version: [$both_added_defs]"
for file in $both_added_defs; do
log "INFO" "NEW INDEXER: Resolving both-added conflict for [$file]"
git checkout --theirs "$file"
git add --force "$file"
done
fi
if [ -n "$nonyml_conflicts" ]; then if [ -n "$nonyml_conflicts" ]; then
log "DEBUG" "Non-YML conflicts exist; removing [\n$nonyml_conflicts\n] files and restoring [package.json package-lock.json .editorconfig]" log "DEBUG" "Non-YML conflicts exist; removing [\n$nonyml_conflicts\n] files and restoring [package.json package-lock.json .editorconfig]"
while IFS= read -r file; do while IFS= read -r file; do