From b2b2add4c646d936767a4f47f69f1ac3209fcab9 Mon Sep 17 00:00:00 2001 From: Matthias Stecher Date: Sun, 24 Jan 2021 09:25:02 +0100 Subject: [PATCH] __matrix_element: fix download tarball name All releases after 1.7.14 have a diffrent tarball name than releases before this. This finally takes over the new name. The version comparement function was taken from __sensible_editor, to provide backward compatibility to older versions (if someone needs it). Maybe this logic can be removed in a while .. --- type/__matrix_element/gencode-remote | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/type/__matrix_element/gencode-remote b/type/__matrix_element/gencode-remote index e643976..ff3bbaa 100755 --- a/type/__matrix_element/gencode-remote +++ b/type/__matrix_element/gencode-remote @@ -18,11 +18,37 @@ # along with cdist. If not, see . # +# Function to compare version strings. Returns success (0) if the version +# given by stdin is higher than the version provided by the argument. +# +# Taken from the cdist core type __sensible_editor. +version_ge() { + awk -F '[^0-9.]' -v target="${1:?}" ' + function max(x, y) { return x > y ? x : y; } + BEGIN { + getline; + nx = split($1, x, "."); + ny = split(target, y, "."); + for (i = 1; i <= max(nx, ny); ++i) { + diff = int(x[i]) - int(y[i]); + if (diff < 0) exit 1; + else if (diff > 0) exit 0; + else continue; + } + }' +} + + VERSION=$(cat "$__object/parameter/version") INSTALL_DIR=$(cat "$__object/parameter/install_dir") OWNER=$(cat "$__object/parameter/owner") -src="riot-v$VERSION" +# tarball name changed due to application renaming +if echo "$VERSION" | version_ge 1.7.14; then + src="element-v$VERSION" +else + src="riot-v$VERSION" +fi archive="$src.tar.gz" url="https://github.com/vector-im/riot-web/releases/download/v$VERSION/$archive"