Skip to content

Commit cf9d806

Browse files
committed
Fixing file_url link
1 parent 951a8c9 commit cf9d806

1 file changed

Lines changed: 17 additions & 9 deletions

File tree

scripts/generate-armbian-images-json.sh

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ cat "$tmpdir/a.txt" "$tmpdir/bcd.txt" >"$feed"
425425
IMAGE_NAME="${URL##*/}"
426426

427427
mapfile -t p < <(parse_image_name "$IMAGE_NAME")
428-
VER="${p[0]}"; BOARD="${p[1]}"; DISTRO="${p[2]}"; BRANCH="${p[3]}"
429-
VARIANT="${p[4]}"; APP="${p[5]}"; STORAGE="${p[6]}"
428+
VER="${p[0]:-}"; BOARD="${p[1]:-}"; DISTRO="${p[2]:-}"; BRANCH="${p[3]:-}"
429+
VARIANT="${p[4]:-server}"; APP="${p[5]:-}"; STORAGE="${p[6]:-}"
430430

431431
[[ -z "$BOARD" ]] && continue
432432
BOARD_SLUG="${BOARD,,}"
@@ -448,14 +448,19 @@ cat "$tmpdir/a.txt" "$tmpdir/bcd.txt" >"$feed"
448448
APP_SUFFIX=""; [[ -n "$APP" ]] && APP_SUFFIX="-${APP}"
449449
REDI_URL="https://dl.armbian.com/${PREFIX}${BOARD_SLUG}/${DISTRO^}_${BRANCH}_${VARIANT}${APP_SUFFIX}"
450450

451+
# file_url must remain the original URL (GitHub Releases for community/os/distribution)
452+
FILE_URL="$URL"
453+
451454
if [[ "$URL" == https://github.com/armbian/* ]]; then
452455
CACHE="https://cache.armbian.com/artifacts/${BOARD_SLUG}/archive/${IMAGE_NAME}"
453-
ASC="$CACHE.asc"; SHA="$CACHE.sha"; TOR="$CACHE.torrent"
456+
ASC="${CACHE}.asc"
457+
SHA="${CACHE}.sha"
458+
TOR="${CACHE}.torrent"
454459
else
455-
ASC="$URL.asc"; SHA="$URL.sha"; TOR="$URL.torrent"
460+
ASC="${URL}.asc"
461+
SHA="${URL}.sha"
462+
TOR="${URL}.torrent"
456463
fi
457-
FILE_URL="${CACHE:-$URL}"
458-
459464
PROMOTED=false
460465
if is_promoted "$IMAGE_NAME" "$BOARD_SLUG" "$URL"; then
461466
PROMOTED=true
@@ -464,9 +469,12 @@ cat "$tmpdir/a.txt" "$tmpdir/bcd.txt" >"$feed"
464469
BOARD_VENDOR="${BOARD_VENDOR_MAP[$BOARD_SLUG]:-}"
465470
BOARD_SUPPORT="${BOARD_SUPPORT_MAP[$BOARD_SLUG]:-}"
466471
COMPANY_KEY="${BOARD_VENDOR,,}"
467-
468-
C_NAME="${COMPANY_NAME_BY_SLUG[$COMPANY_KEY]:-}"
469-
C_WEB="${COMPANY_WEBSITE_BY_SLUG[$COMPANY_KEY]:-}"
472+
C_NAME=""
473+
C_WEB=""
474+
if [[ -n "$COMPANY_KEY" ]]; then
475+
C_NAME="${COMPANY_NAME_BY_SLUG[$COMPANY_KEY]:-}"
476+
C_WEB="${COMPANY_WEBSITE_BY_SLUG[$COMPANY_KEY]:-}"
477+
fi
470478

471479
C_LOGO=""
472480
if [[ -n "$BOARD_VENDOR" ]]; then

0 commit comments

Comments
 (0)