devel→master: Commits for v2.3.0 (#320)

* [harbour-storeman-installer.spec] Post release version increase (#317)

* [harbour-storeman-installer.spec] Fix and beautify (#319)

* [harbour-storeman-installer.spec] Fix missing `$` for variable evaluation (3ffb000)

* [harbour-storeman-installer.spec] Beautify, comment and enhance `%post` scriptlet (5367806)

rpm/harbour-storeman-installer.spec

@@ -4,7 +4,7 @@ Name:           harbour-storeman-installer
 # The Git tag format must adhere to <release>/<version> since 2023-05-18.
 # The <version> tag must adhere to semantic versioning, for details see
 # https://semver.org/
-Version:        2.2.8
+Version:        2.2.9
 # The <release> tag comprises one of {alpha,beta,rc,release} postfixed with a
 # natural number greater or equal to 1 (e.g. "beta3") and may additionally be
 # postfixed with a plus character ("+"), the name of the packager and a release
@@ -15,7 +15,7 @@ Version:        2.2.8
 # build at GitHub and OBS, when configured accordingly; mind the sorting
 # (`adud` < `alpha`).  For details and reasons, see
 # https://github.com/Olf0/sfos-upgrade/wiki/Git-tag-format
-Release:        release9
+Release:        release10
 # The Group tag should comprise one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group:          Software Management/Package Manager
@@ -175,14 +175,15 @@ source %{_sysconfdir}/os-release
 # might be advisable, when using it inside a %%define statement's `%%()` ).
 sailfish_version="$(echo "$VERSION_ID" | cut -s -f 1-3 -d '.' | tr -d '.')"
 # sailfish_version must be an all numerical string of at least three digits:
-if ! echo "sailfish_version" | grep -q '^[0-9][0-9][0-9][0-9]*$'
+if [ $(echo "$sailfish_version" | grep -c '^[0-9][0-9][0-9][0-9]*$') != 1 ]
 then echo "Error: VERSION_ID=$VERSION_ID => sailfish_version=$sailfish_version" >&2
 else
   # Ensure that the repo config is correct: If it is missing or a fixed
   # SFOS-release number was used, set it anew.
   release_macro="$(grep '^harbour-storeman-obs=' %{_sysconfdir}/ssu/ssu.ini | grep -o '/[[:graph:]][[:graph:]][[:graph:]][[:graph:]]*/$' | grep -o '%%(release[[:alpha:]]*)')"
   if [ $sailfish_version -ge 460 ] && [ "$release_macro" != '%%(releaseMajorMinor)' ]
   then
+    # No `ssu rr harbour-storeman-obs` needed, because an `ssu ar <name> <URL>` overwrites an extant entry.
     ssu ar harbour-storeman-obs 'https://repo.sailfishos.org/obs/home:/olf:/harbour-storeman/%%(releaseMajorMinor)_%%(arch)/'
     ssu_ur=yes
   elif [ $sailfish_version -lt 460 ] && [ "$release_macro" != '%%(release)' ]
@@ -191,9 +192,7 @@ else
     ssu_ur=yes
   fi
 fi
-if [ $ssu_ur = yes ]
-then ssu ur
-fi
+[ $ssu_ur = yes ] && ssu ur
 # BTW, `ssu`, `rm -f`, `mkdir -p` etc. *always* return with "0" ("success"), hence
 # no appended `|| true` needed to satisfy `set -e` for failing commands outside of
 # flow control directives (if, while, until etc.).  Furthermore Fedora Docs etc.