Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Adapting to Jolla's perpetual changing of formats …
… and interfaces, this time https://github.com/sailfishos/docs.sailfishos.org/pull/297/files
Luckily the concluding `sort -u` already handled that well, now make more obvious what has to be done.
  • Loading branch information
Olf0 committed Apr 6, 2023
1 parent d22f961 commit 1fc4f91
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bin/sfos-upgrade
Expand Up @@ -249,7 +249,7 @@ else
fi
# As of 2023-03-18 (i.e., 4.5.0.18 is the newest release) this works fine despite *and* because of busybox's `sort` lacking `-V`: 3.0.0.11, which was a release only for the Inoi R7, is treated as smaller than 3.0.0.8, which is the correct stop release version of 3.0.0.x.
# But as soon as a stop release version X.Y.Z is publicly released (cBetas are *not* public) with both, point releases smaller and larger than 10, this ceases to work as intended. Likely it will still work out O.K. in practice.
all_stop_versions="$(printf '%s\n%s' "$(printf '%s' "$sailfishdocs_stop_releases" | cut -s -d '.' -f 1-3)" "$(printf '%s' "$mylist_stop_versions" | tr ',' '\n')" | fgrep -vx '' | sort -u)"
all_stop_versions="$(printf '%s\n%s' "$(printf '%s' "$sailfishdocs_stop_releases" | cut -s -d '.' -f 1-3 | uniq)" "$(printf '%s' "$mylist_stop_versions" | tr ',' '\n')" | fgrep -vx '' | sort -u)"
all_stop_releases="$(for i in $all_stop_versions; do printf '%s' "$all_sfos_releases" | grep -xm 1 "${i}\.[0-9][0-9]*"; done)"
compar0="$(compare_versions "$installed_release" "$upgrade_release")"
case "$compar0" in
Expand Down

0 comments on commit 1fc4f91

Please sign in to comment.