From ece63441b92e2ad38f08c8a1f59364c7d72135bc Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: May 08 2024 17:31:30 +0000 Subject: Update extras logic for f40 and later --- diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh index 0e8504f..f7ec675 100755 --- a/make-asahi-installer-package.sh +++ b/make-asahi-installer-package.sh @@ -87,12 +87,16 @@ pushd "${workdir}/package" > /dev/null 7z a -tzip -r "${basedir}/${package}" . popd > /dev/null -openh264_rpms=$(rpmdistro-repoquery fedora "$release" gstreamer1-plugin-openh264 mozilla-openh264 openh264 --location) +openh264_rpms="mozilla-openh264 openh264" +if [ "$release" != rawhide -a $release -le 39 ]; then + openh264_rpms="gstreamer1-plugin-openh264 ${openh264_rpms}" +fi +openh264_urls=$(rpmdistro-repoquery fedora "$release" ${openh264_rpms} --location) -if [ -e "${openh264_rpms}" ]; then +if [ -e "${openh264_urls}" ]; then extras="{}" else - extras="$(printf '%s\n' "${openh264_rpms}" | newlineToJson)" + extras="$(printf '%s\n' "${openh264_urls}" | newlineToJson)" fi cat > "${package}.json" < "${package}.json" <