From 86dbe1b730471227cfdb3f06f6d8c8d40efb2ff1 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Sat, 19 Sep 2020 10:31:13 +0200
Subject: [PATCH] Remove debug, and properly check versions
---
update_element_im.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/update_element_im.sh b/update_element_im.sh
index 9e6a33d..bb7f64f 100755
--- a/update_element_im.sh
+++ b/update_element_im.sh
@@ -4,7 +4,6 @@ set -e
set -o errexit
set -o pipefail
set -o nounset
-set -x
function version_gt() {
test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1";
@@ -12,7 +11,7 @@ function version_gt() {
function cleanup() {
local tmpdir=$1
- rm -r "${tmpdir:?}"/*
+ # rm -r "${tmpdir:?}"/*
rmdir "${tmpdir}"
}
@@ -61,11 +60,11 @@ WEB_USER="nginx"
github_data=$(curl -s https://api.github.com/repos/vector-im/element-web/releases/latest)
current_version=$(curl -s "${HOMESERVER_URL}/version")
-remote_version=$(echo "${github_data}" | jq '.name')
+remote_version=$(echo "${github_data}" | jq -r '.name')
echo "Checking for version updates..."
-if version_gt "${remote_version}" "${current_version}"
+if version_gt "${remote_version}" "v${current_version}"
then
asset_name=$(echo "${github_data}" | jq -r '.assets[] |
select(.browser_download_url|endswith("tar.gz")) |