Skip to content

Commit

Permalink
[harbour-storeman-installer.spec] Fix and beautify (#319)
Browse files Browse the repository at this point in the history
* [harbour-storeman-installer.spec] Fix missing `$` for variable evaluation

* [harbour-storeman-installer.spec] Beautify, comment and enhance `%post` scriptlet
  • Loading branch information
Olf0 authored Nov 24, 2024
1 parent f8868ee commit ca6ad43
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions rpm/harbour-storeman-installer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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)' ]
Expand All @@ -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.
Expand Down

0 comments on commit ca6ad43

Please sign in to comment.