diff --git a/anda/lib/nvidia/cuda-gcc/update.rhai b/anda/lib/nvidia/cuda-gcc/update.rhai index 6a220733c0..0ae33b14f1 100644 --- a/anda/lib/nvidia/cuda-gcc/update.rhai +++ b/anda/lib/nvidia/cuda-gcc/update.rhai @@ -1,3 +1,3 @@ import "andax/bump_extras.rhai" as bump; -rpm.version(bump::bodhi("gcc13", labels.branch.as_bodhi_ver())); +rpm.version(bump::bodhi("gcc13", bump::as_bodhi_ver(labels.branch))); diff --git a/anda/multimedia/ffmpeg/update.rhai b/anda/multimedia/ffmpeg/update.rhai index 415b1d4994..3f65562948 100644 --- a/anda/multimedia/ffmpeg/update.rhai +++ b/anda/multimedia/ffmpeg/update.rhai @@ -1,9 +1,9 @@ import "andax/bump_extras.rhai" as bump; -//rpm.version(find(`ffmpeg-([\d.]+?)\.tar\.xz`, get("https://ffmpeg.org/download.html"), 1)); +rpm.version(find(`ffmpeg-([\d.]+?)\.tar\.xz`, get("https://ffmpeg.org/download.html"), 1)); let ffmpeg_ver = get(`https://madoguchi.fyralabs.com/v4/terra${labels.branch}/packages/x265`).json().ver; open_file("anda/fusion/ffmpeg/VERSION_x265.txt", "w").write(ffmpeg_ver); -let tesseract_ver = bump::bodhi("tesseract", labels.branch.as_bodhi_ver()); +let tesseract_ver = bump::bodhi("tesseract", bump::as_bodhi_ver(labels.branch)); open_file("anda/fusion/ffmpeg/VERSION_tesseract.txt", "w").write(tesseract_ver); diff --git a/andax/bump_extras.rhai b/andax/bump_extras.rhai index c7c21db7b4..2d8e9de48c 100644 --- a/andax/bump_extras.rhai +++ b/andax/bump_extras.rhai @@ -6,10 +6,10 @@ fn as_bodhi_ver(branch) { } return `EPEL-${release}`; } else if branch == "frawhide" { - return "42"; + return "F42"; } else if branch.starts_with("f") { branch.crop(1); - return branch; + return `F${branch}`; } else { print(`E: unsupported branch: ${labels.branch}`); terminate();