From 932977d9812401a4935727b8b0131c56b8f1f588 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 2 Mar 2021 03:38:47 +0100 Subject: [PATCH] Change "\n" to "," in list of known "stop releases" Change "\n" to "," in the list of known "stop releases", hence it needs to be evaluated per: $(echo "$known_stop_releases" | tr ',' '\n') --- usr/bin/sfos-upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/bin/sfos-upgrade b/usr/bin/sfos-upgrade index 377be3a..4af5325 100644 --- a/usr/bin/sfos-upgrade +++ b/usr/bin/sfos-upgrade @@ -180,7 +180,7 @@ fi if [ "$installed_release" = "$upgrade_release" ] then compar0="e4" else - known_stop_releases="4.0.1.48\n3.4.0.24\n3.2.0.12\n3.0.0.8\n2.2.0.29\n2.0.5.6\n2.0.0.10\n1.1.9.30\n1.1.7.28\n1.1.2.16\n1.0.2.5\n1.0.0.5" + known_stop_releases="4.0.1.48,3.4.0.24,3.2.0.12,3.0.0.8,2.2.0.29,2.0.5.6,2.0.0.10,1.1.9.30,1.1.7.28,1.1.2.16,1.0.2.5,1.0.0.5" # 0.99.5.11, 1.0.0.5 and 1.0.1.10 are not documented to be "stop releases", # taking the information of sections 4 and 5 (in combination!) at # https://jolla.zendesk.com/hc/en-us/articles/201836347#4 into account. @@ -205,7 +205,7 @@ else # askyes >&2 # echo >&2 #fi - all_stop_releases="$(echo -e "${recent_stop_releases}\n$known_stop_releases" | grep -v '^$' | sort -u)" + all_stop_releases="$(echo -e "${recent_stop_releases}\n$(echo "$known_stop_releases" | tr ',' '\n')" | grep -v '^$' | sort -u)" compar0="$(compare_versions "$installed_release" "$upgrade_release")" case "$compar0" in e?) # Equality