From 98dc1d3c939a192c4ad74d2bb9788e3d4ea6bafc Mon Sep 17 00:00:00 2001 From: ServarrAdmin Date: Sun, 22 Dec 2024 12:45:03 -0600 Subject: [PATCH] script: more development support --- scripts/indexer-sync-v2.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/scripts/indexer-sync-v2.sh b/scripts/indexer-sync-v2.sh index 61c025487..705fdf5c5 100644 --- a/scripts/indexer-sync-v2.sh +++ b/scripts/indexer-sync-v2.sh @@ -44,11 +44,20 @@ usage() { Options: -r Set the Prowlarr remote name. Default: $prowlarr_remote_name -b Set the Prowlarr target branch. Default: $prowlarr_target_branch - -m Set the operational mode: - - $(normal): Default mode with regular operations. - - $(dev | development | D | d): Enables development mode, skips upstream reset, uses local branches, and pauses at debugging points for review. - - $(jackett | j | J): Enables Jackett development mode, skips upstream reset, uses existing local Jackett and Prowlarr branches, and pauses at debugging points for review. - Default: $mode_choice + -m Set the operational mode: + - $(normal): Default mode with regular operations. + - $(dev | development | D | d): + Enables development mode: + - Skips upstream reset. + - Uses local branches. + - Pauses at debugging points for review. + - $(jackett | j | J): + Enables Jackett development mode: + - Skips upstream reset. + - Uses existing local Jackett and Prowlarr branches. + - Pauses at debugging points for review. + - Local branch used: $JACKETT_REMOTE_NAME_$JACKETT_BRANCH + Default: $mode_choice -p Enable push to remote. Default: $push_mode -f Force push if pushing. Default: $push_mode_force -c Set the commit template for Prowlarr. Default: $PROWLARR_COMMIT_TEMPLATE @@ -350,8 +359,7 @@ pull_cherry_and_merge() { prowlarr_jackett_commit_message=$(echo "$prowlarr_commits" | awk 'NR==1') if [ "$is_jackett_dev" = true ]; then # Use only local Jackett branch (no remote) - jackett_ref="$JACKETT_BRANCH" - else + jackett_ref="$JACKETT_REMOTE_NAME_$JACKETT_BRANCH" # Normal usage: remote reference jackett_ref="$JACKETT_REMOTE_NAME/$JACKETT_BRANCH" fi