[-]
[+]
|
Changed |
_service:tar_git:sfos-upgrade.spec
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/Olf0/sfos-upgrade.git</param>
<param name="branch">master</param>
- <param name="revision">3.7.8</param>
+ <param name="revision">3.8.0</param>
</service>
</services>
|
[-]
[+]
|
Changed |
_service:tar_git:sfos-upgrade-3.8.0.tar.gz/README.md
^
|
@@ -36,7 +36,7 @@
Performs a "samegrade" operation, i.e. checks if the correct versions of all recent RPMs are installed and updates or installs them accordingly.<br />
This option was introduced with v3.7.0.
-* **sfos-upgrade -h|--help**<br />
+* **sfos-upgrade -?|--help**<br />
Emits a brief usage description.
When an upgrade succeeded, reboot, and do not miss to run **post_sfos-upgrade** (as root) then!<br />
|
[-]
[+]
|
Changed |
_service:tar_git:sfos-upgrade-3.8.0.tar.gz/usr/bin/sfos-upgrade
^
|
@@ -2,7 +2,7 @@
set -euC -o posix # Omitting -f (aka -o noglob), because bash 3.2.57(1)-release does not perform a set +f (or +o noglob; plus setopt is not built-in) correctly, which would be needed later!
# Switched to use bash since version 2.1 of this script (in its first line), as this ensures that "-o pipefail"
-# (in line 630) is available, after checking that bash seems to be present in mer-core at least since 2011-10-04
+# (in line 633) is available, after checking that bash seems to be present in mer-core at least since 2011-10-04
# (see https://git.sailfishos.org/mer-core/bash / https://git.merproject.org/mer-core/bash ) and consequently in
# SailfishOS since its beginnings (checked v1.0.0.5 per
# curl https://releases.sailfishos.org/sources/sailfish-1.0.0.5-oss.tar.bz2 | tar -tv | fgrep 'bash' , as no earlier
@@ -120,7 +120,7 @@
--verify)
upgrade_release="$installed_release"
;;
- -h|--help)
+ -\?|--help)
echo "Usage: $called [<version>|--verify|--help]"
echo "With a version number provided as parameter it sets SSU to this version and in release mode before upgrading. This is the regular use case."
echo "Without a version number it retrieves the one set for SSU to perform slightly relaxed checks, but does not alter SSU's settings for upgrading."
@@ -154,7 +154,7 @@
echo >&2
;;
*)
- echo "Comparing versions in check for the installed version differing from the one currently set for SSU failed." >&2
+ echo "Comparing versions failed when checking, if the installed version differs from the one currently set for SSU." >&2
exit 7
;;
esac
@@ -180,7 +180,7 @@
if [ "$installed_release" = "$upgrade_release" ]
then compar0="e4"
else
- known_stop_releases="3.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="3.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"
# 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.
|