From a03b29ba01e2e09e1d939c6e8590b9b635d41446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Tue, 26 Dec 2023 15:43:50 +0100 Subject: [PATCH] add version sort to get the latest version, fixes #348. --- .docker/chromium/Dockerfile | 2 +- .docker/chromium/Dockerfile.nvidia | 2 +- .docker/microsoft-edge/Dockerfile | 2 +- .docker/microsoft-edge/Dockerfile.nvidia | 2 +- .docker/opera/Dockerfile | 2 +- .docker/ungoogled-chromium/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.docker/chromium/Dockerfile b/.docker/chromium/Dockerfile index a8af3c3..6287f58 100644 --- a/.docker/chromium/Dockerfile +++ b/.docker/chromium/Dockerfile @@ -10,7 +10,7 @@ RUN set -eux; \ # # install widevine module CHROMIUM_DIR="/usr/lib/chromium"; \ - WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | tail -n 1); \ + WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | sort --version-sort | tail -n 1); \ wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-x64.zip"; \ mkdir -p "${CHROMIUM_DIR}/WidevineCdm/_platform_specific/linux_x64"; \ unzip -p /tmp/widevine.zip LICENSE.txt > "${CHROMIUM_DIR}/WidevineCdm/LICENSE"; \ diff --git a/.docker/chromium/Dockerfile.nvidia b/.docker/chromium/Dockerfile.nvidia index ebd5e76..752a7d9 100644 --- a/.docker/chromium/Dockerfile.nvidia +++ b/.docker/chromium/Dockerfile.nvidia @@ -14,7 +14,7 @@ RUN set -eux; \ # # install widevine module CHROMIUM_DIR="/usr/lib/chromium"; \ - WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | tail -n 1); \ + WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | sort --version-sort | tail -n 1); \ wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-x64.zip"; \ mkdir -p "${CHROMIUM_DIR}/WidevineCdm/_platform_specific/linux_x64"; \ unzip -p /tmp/widevine.zip LICENSE.txt > "${CHROMIUM_DIR}/WidevineCdm/LICENSE"; \ diff --git a/.docker/microsoft-edge/Dockerfile b/.docker/microsoft-edge/Dockerfile index 102542c..a291fad 100644 --- a/.docker/microsoft-edge/Dockerfile +++ b/.docker/microsoft-edge/Dockerfile @@ -8,7 +8,7 @@ ARG API_URL="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edg RUN set -eux; apt-get update; \ # # fetch latest release - SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | tail -1)"; \ + SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | sort --version-sort | tail -1)"; \ wget -O /tmp/microsoft-edge.deb "${SRC_URL}"; \ apt-get install -y --no-install-recommends openbox /tmp/microsoft-edge.deb; \ # diff --git a/.docker/microsoft-edge/Dockerfile.nvidia b/.docker/microsoft-edge/Dockerfile.nvidia index 2e7f1ed..1ba67c1 100644 --- a/.docker/microsoft-edge/Dockerfile.nvidia +++ b/.docker/microsoft-edge/Dockerfile.nvidia @@ -8,7 +8,7 @@ ARG API_URL="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edg RUN set -eux; apt-get update; \ # # fetch latest release - SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | tail -1)"; \ + SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | sort --version-sort | tail -1)"; \ wget -O /tmp/microsoft-edge.deb "${SRC_URL}"; \ apt-get install -y --no-install-recommends openbox /tmp/microsoft-edge.deb; \ # diff --git a/.docker/opera/Dockerfile b/.docker/opera/Dockerfile index 79044cf..e02697d 100644 --- a/.docker/opera/Dockerfile +++ b/.docker/opera/Dockerfile @@ -9,7 +9,7 @@ ARG LIBFFMPEG_API_URL="https://api.github.com/repos/nwjs-ffmpeg-prebuilt/nwjs-ff RUN set -eux; apt-get update; \ # # fetch latest release - VERSION="$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"/]*\).*/\1/p' | tail -1)"; \ + VERSION="$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"/]*\).*/\1/p' | sort --version-sort | tail -1)"; \ wget -O /tmp/opera.deb "${API_URL}${VERSION}/linux/opera-stable_${VERSION}_amd64.deb"; \ apt-get install -y --no-install-recommends openbox jq unzip /tmp/opera.deb; \ # diff --git a/.docker/ungoogled-chromium/Dockerfile b/.docker/ungoogled-chromium/Dockerfile index af21521..f0d29c3 100644 --- a/.docker/ungoogled-chromium/Dockerfile +++ b/.docker/ungoogled-chromium/Dockerfile @@ -21,7 +21,7 @@ RUN set -eux; apt-get update; \ chmod 4755 /usr/lib/chromium/chrome-sandbox; \ # # install widevine module - WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | tail -n 1); \ + WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | sort --version-sort | tail -n 1); \ wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-x64.zip"; \ unzip -p /tmp/widevine.zip libwidevinecdm.so > /usr/lib/chromium/libwidevinecdm.so; \ chmod 644 /usr/lib/chromium/libwidevinecdm.so; \