Обновить .woodpecker/sync-releases.yml

.woodpecker/sync-releases.yml

@@ -25,62 +25,51 @@ steps:
       - |
         #!/bin/bash
         set -e
-        set -x # ОСТАВЬТЕ ДЛЯ ПЕРВОГО ЗАПУСКА
+        # set -x # ЗАКОММЕНТИРУЙТЕ ПОСЛЕ ОТЛАДКИ!
 
         echo "Starting release sync..."
         REPO_FILE="${REPO_LIST_FILE:-repos_to_sync.txt}"
 
-        # --- Проверки и Отладка Переменных ---
+        # --- Проверки Переменных ---
         echo "--- Variable Checks ---"
         if [ -z "$GITEA_URL" ]; then echo "FATAL: GITEA_URL is empty!"; exit 1; fi
-        echo "GITEA_URL (outside subshell): $GITEA_URL"
+        echo "GITEA_URL check: OK (value hidden)"
         if [ -z "$GITEA_TOKEN" ]; then echo "FATAL: GITEA_TOKEN is empty!"; exit 1; fi
         echo "GITEA_TOKEN check: OK (value hidden)"
         if [ ! -f "$REPO_FILE" ]; then echo "FATAL: File '$REPO_FILE' not found!"; exit 1; fi
         echo "REPO_FILE check: OK ($REPO_FILE)"
-
-        # Дополнительная проверка доступности GITEA_URL ВНУТРИ subshell
-        SUBSHELL_GITEA_URL=$(echo "$GITEA_URL")
-        echo "GITEA_URL (from inside subshell): $SUBSHELL_GITEA_URL"
-        if [ -z "$SUBSHELL_GITEA_URL" ]; then
-            echo "FATAL: GITEA_URL seems empty inside subshell!"
-            # Попробуем без sed, если subshell пуст
-             GITEA_BASE_URL="$GITEA_URL" # Просто присвоим, чтобы увидеть, сработает ли это
-             echo "Attempting direct assignment for GITEA_BASE_URL: $GITEA_BASE_URL"
-        else
-            # Если subshell работает, используем echo | sed
-            echo "Subshell check OK. Calculating GITEA_BASE_URL using echo | sed..."
-            GITEA_BASE_URL=$(echo "${SUBSHELL_GITEA_URL}" | sed 's|/api/v1$||; s|/*$||')
-        fi
-
-        # Проверка результата после вычисления
-        if [ -z "$GITEA_BASE_URL" ]; then echo "FATAL: Failed to calculate GITEA_BASE_URL!"; exit 1; fi
-        GITEA_API_URL="${GITEA_BASE_URL}/api/v1"
-        echo "Final GITEA_BASE_URL: ${GITEA_BASE_URL}"
-        echo "Final GITEA_API_URL: ${GITEA_API_URL}"
         echo "--- End Variable Checks ---"
 
         GITEA_AUTH_HEADER="Authorization: token ${GITEA_TOKEN}"
+
+        # ИСПРАВЛЕНИЕ: Используем ${GITEA_URL} внутри echo !!!
+        echo "Calculating GITEA_BASE_URL from GITEA_URL..."
+        GITEA_BASE_URL=$(echo "${GITEA_URL}" | sed 's|/api/v1$||; s|/*$||')
+        if [ -z "$GITEA_BASE_URL" ]; then
+             echo "FATAL: GITEA_BASE_URL is empty after sed processing GITEA_URL='${GITEA_URL}'!"
+             exit 1
+        fi
+        GITEA_API_URL="${GITEA_BASE_URL}/api/v1"
+        echo "Calculated Gitea Base URL: ${GITEA_BASE_URL}"
+        echo "Calculated Gitea API URL: ${GITEA_API_URL}"
+
         GITHUB_AUTH_HEADER=""
         if [ -n "$GITHUB_TOKEN" ]; then GITHUB_AUTH_HEADER="Authorization: token ${GITHUB_TOKEN}"; fi
         GITHUB_API_URL="https://api.github.com"
 
         # --- Вспомогательные функции ---
-        # ... (без изменений) ...
         download_asset() { local url="$1"; local filename="$2"; echo "Downloading asset: $filename"; curl -L -H "$GITHUB_AUTH_HEADER" -o "$filename" "$url"; return $?; }
         upload_asset() {
           local repo="$1"; local id="$2"; local file="$3"
           local filename_basename=$(basename "$file")
           echo "Uploading asset: $file (as $filename_basename)"
           local TARGET_URL="${GITEA_API_URL}/repos/${repo}/releases/${id}/assets?name=${filename_basename}"
-          echo "DEBUG: Upload Asset URL: ${TARGET_URL}"
+          echo "DEBUG: Upload Asset URL: ${TARGET_URL}" # Оставляем отладку URL
           curl -sf --fail -X POST -H "$GITEA_AUTH_HEADER" -H "Content-Type: application/octet-stream" --data-binary "@$file" "${TARGET_URL}"
           local status=$?; if [ $status -eq 0 ]; then rm "$file"; fi; return $status;
         }
 
-
         # --- Основной цикл ---
-        # ... (без изменений, но теперь должен работать с правильными URL) ...
         echo "Reading repository list from $REPO_FILE"
         while IFS= read -r repo_pair || [[ -n "$repo_pair" ]]; do
           if [[ -z "$repo_pair" || "$repo_pair" == \#* ]]; then continue; fi
@@ -90,13 +79,13 @@ steps:
           echo "-------------------------------------"; echo "Syncing: $GITHUB_REPO_PATH -> $GITEA_REPO_PATH"
 
           FETCH_GITEA_URL="${GITEA_API_URL}/repos/${GITEA_REPO_PATH}/releases"
-          echo "DEBUG: Fetch Gitea Releases URL: ${FETCH_GITEA_URL}"
+          echo "DEBUG: Fetch Gitea Releases URL: ${FETCH_GITEA_URL}" # Оставляем отладку URL
           echo "Fetching Gitea releases...";
           GITEA_RELEASES_JSON=$(curl -sf --fail -H "$GITEA_AUTH_HEADER" "${FETCH_GITEA_URL}") || { echo "Error Gitea fetch: $GITEA_REPO_PATH"; continue; }
           EXISTING_GITEA_TAGS=$(echo "$GITEA_RELEASES_JSON" | jq -r '.[].tag_name')
 
           FETCH_GITHUB_URL="${GITHUB_API_URL}/repos/${GITHUB_REPO_PATH}/releases?per_page=20"
-          echo "DEBUG: Fetch GitHub Releases URL: ${FETCH_GITHUB_URL}"
+          echo "DEBUG: Fetch GitHub Releases URL: ${FETCH_GITHUB_URL}" # Оставляем отладку URL
           echo "Fetching GitHub releases...";
           GITHUB_RELEASES_JSON=$(curl -sf --fail -H "$GITHUB_AUTH_HEADER" "${FETCH_GITHUB_URL}") || { echo "Error GitHub fetch: $GITHUB_REPO_PATH"; continue; }
 
@@ -106,7 +95,7 @@ steps:
             echo ">>> New release: $TAG_NAME"; RELEASE_NAME=$(echo "$release_json" | jq -r '.name'); RELEASE_BODY=$(echo "$release_json" | jq -r '.body // ""'); IS_PRERELEASE=$(echo "$release_json" | jq -r '.prerelease'); ASSETS=$(echo "$release_json" | jq -c '.assets[]')
 
             CREATE_GITEA_URL="${GITEA_API_URL}/repos/${GITEA_REPO_PATH}/releases"
-            echo "DEBUG: Create Gitea Release URL: ${CREATE_GITEA_URL}"
+            echo "DEBUG: Create Gitea Release URL: ${CREATE_GITEA_URL}" # Оставляем отладку URL
             echo "Creating Gitea release $TAG_NAME...";
             CREATE_PAYLOAD=$(jq -n --arg t "$TAG_NAME" --arg n "$RELEASE_NAME" --arg b "$RELEASE_BODY" --argjson p "$IS_PRERELEASE" '{tag_name:$t, name:$n, body:$b, prerelease:$p}')
             GITEA_NEW_RELEASE_JSON=$(curl -sf --fail -X POST -H "$GITEA_AUTH_HEADER" -H "Content-Type: application/json" -d "$CREATE_PAYLOAD" "${CREATE_GITEA_URL}") || { echo "Error creating Gitea release $TAG_NAME (maybe tag not synced?). Skipping."; continue; }