Skip to content

minor cleanups and fixes#569

Merged
vvoland merged 4 commits into
docker:masterfrom
thaJeztah:cleanup_ver
Jul 13, 2026
Merged

minor cleanups and fixes#569
vvoland merged 4 commits into
docker:masterfrom
thaJeztah:cleanup_ver

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

fix indentation

always declare cli_pkg_version

No real impact, but $cli_pkg_version was used unconditionally,
but was set conditionally.

move vars closer to where used

prevent bare "=" as version

Make sure both pkg_version and cli_pkg_version are only set on success
to prevent them containing a bare "=", which we were stripping later on.

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
No real impact, but `$cli_pkg_version` was used unconditionally,
but was set conditionally.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Make sure both pkg_version and cli_pkg_version are only set on success
to prevent them containing a bare "=", which we were stripping later on.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR makes small correctness/cleanup improvements to the install.sh installer, primarily around version pinning logic so that package version suffixes are only applied when a repository lookup succeeds.

Changes:

  • Initialize cli_pkg_version alongside pkg_version to avoid unconditionally using an unset variable.
  • For APT installs, only prefix = onto pkg_version / cli_pkg_version after a successful lookup, removing the need for later %=} stripping.
  • For YUM/DNF installs, ensure pkg_version is only derived/rewritten after validating the lookup succeeded, and move version-massaging closer to where it’s used.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@thaJeztah thaJeztah requested a review from vvoland July 13, 2026 10:51
@vvoland vvoland merged commit 02cb80d into docker:master Jul 13, 2026
13 checks passed
@thaJeztah thaJeztah deleted the cleanup_ver branch July 13, 2026 12:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants