Skip to content

Commit

Permalink
Fix copy'o: Rename vars …_version…_release (#78)
Browse files Browse the repository at this point in the history
* Fix copy'o: Rename vars `…_version`→`…_release`

* Post spoiled (#77) release version increase
  … hence not increasing the release version
  • Loading branch information
Olf0 authored Jan 23, 2023
2 parents 8e876bb + ea0e57c commit 9efb658
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion rpm/sfos-upgrade.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Summary: Scripts for fail-safe upgrading of SailfishOS at the command line
# is comprised of {alpha,beta,rc,release} postfixed with a natural number
# greater or equal to 1 (e.g. "beta3"). For details and reasons, see
# https://github.com/Olf0/sfos-upgrade/wiki/Git-tag-format
Version: 3.9.13
Version: 3.9.14
Release: release6
Group: Applications/System
Distribution: SailfishOS
Expand Down
6 changes: 3 additions & 3 deletions usr/bin/sfos-upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ mylist_sfos_releases="4.4.0.72,4.4.0.68,4.4.0.64,4.4.0.58,4.3.0.15,4.3.0.12,4.2.
my_recent_sfos_release="$(echo "$mylist_sfos_releases" | cut -f 1 -d ',')"
sailfishdocs_sfos_list=""
sailversion_sfos_releases=""
case "$(compare_versions "$upgrade_version" "$my_recent_sfos_release")$(compare_versions "$installed_version" "$my_recent_sfos_release")" in
case "$(compare_versions "$upgrade_release" "$my_recent_sfos_release")$(compare_versions "$installed_release" "$my_recent_sfos_release")" in
g???|??g?) # Only download lists of SailfishOS releases, if the installed release and / or the one to upgrade to is larger than the first entry of the internal list of SailfishOS releases.
sailfishdocs_fail="y"
sailversion_fail="y"
Expand Down Expand Up @@ -225,8 +225,8 @@ else
# Trivial, insufficient check for missing entries (both lists MUST be diligently updated concurrently!):
#for i in $(echo "$mylist_stop_releases" | tr ',' ' '); do if echo "$mylist_sfos_releases" | fgrep -q "$i"; then echo "${i}!"; fi; done
#my_recent_stop_release="$(echo "$mylist_stop_releases" | cut -f 1 -d ',')"
#case "$(compare_versions "$upgrade_version" "$my_recent_stop_release")$(compare_versions "$installed_version" "$my_recent_stop_release")" in
case "$(compare_versions "$upgrade_version" "$my_recent_sfos_release")$(compare_versions "$installed_version" "$my_recent_sfos_release")" in
#case "$(compare_versions "$upgrade_release" "$my_recent_stop_release")$(compare_versions "$installed_release" "$my_recent_stop_release")" in
case "$(compare_versions "$upgrade_release" "$my_recent_sfos_release")$(compare_versions "$installed_release" "$my_recent_sfos_release")" in
g???|??g?) # Only download lists of SailfishOS stop releases, if the installed release and / or the one to upgrade to is larger than the first entry of the internal list of SailfishOS releases (deliberately not the list of stop releases!).
if ! sailfishdocs_stop_releases="$(echo "$sailfishdocs_sfos_list" | fgrep -i 'stoprelease' | cut -s -d '|' -f 1 | grep '^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$')"
then
Expand Down

0 comments on commit 9efb658

Please sign in to comment.