From 5ce09eabba6c9b9a90d8e1230d02ec0ff82e6d44 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Sat, 5 Feb 2022 18:44:22 +0100 Subject: [PATCH] docker_rpmbuild-rebuild_msmtp.sh : remove jq depencency --- docker_rpmbuild-rebuild_msmtp.sh | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/docker_rpmbuild-rebuild_msmtp.sh b/docker_rpmbuild-rebuild_msmtp.sh index cd67eb7..0dcdffc 100755 --- a/docker_rpmbuild-rebuild_msmtp.sh +++ b/docker_rpmbuild-rebuild_msmtp.sh @@ -8,30 +8,13 @@ cd ${ABSDIR} type -P docker >/dev/null && DOCKER=$(which docker) type -P podman >/dev/null && DOCKER=$(which podman) -if ! type -P jq >/dev/null ; then - echo "Error : please install jq" +if ! JSONLINE=$(curl -s https://src.fedoraproject.org/_dg/bodhi_updates/rpms/msmtp | grep -e "fc${FROMFEDORA}\","); then + echo "ERROR : No msmtp release available for Fedora ${FROMFEDORA}" + echo "Please check https://src.fedoraproject.org/rpms/msmtp to choose the right release." exit 1 fi -TMPFILE=/tmp/fedoraproject_msmtp_$$ - -curl -s https://src.fedoraproject.org/_dg/bodhi_updates/rpms/msmtp -o ${TMPFILE} -if ! jq -e .releases.F${FROMFEDORA} ${TMPFILE} >&/dev/null; then - echo "ERROR : No msmtp release available for Fedora ${FROMFEDORA}" - echo "Please check https://src.fedoraproject.org/rpms/msmtp to choose the right release." - exit 2 -fi - -if MSMTP=$(jq -re .updates.F${FROMFEDORA}.stable ${TMPFILE}); then - echo "Found ${MSMTP} for Fedora ${FROMFEDORA}" -else - echo "ERROR : No stable msmtp release available for Fedora ${FROMFEDORA}." - echo "Please check https://src.fedoraproject.org/rpms/msmtp to choose the right release." - exit 3 -fi -rm ${TMPFILE} - -MSMTP_VERSION=$(echo "${MSMTP}" | sed -e "s/msmtp-\(.*\)\.fc${FROMFEDORA}$/\1/") +MSMTP_VERSION=$(echo "${JSONLINE}" | sed -e "s/^\s*\"stable\": \"msmtp-\(.*\)\.fc${FROMFEDORA}\",\s*$/\1/") ARCH=$(${DOCKER} run --rm docker.io/library/rockylinux:8 uname -i)