From 185f49d86d1e2269cefce527141d6e86cf3ae030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 20 Mar 2024 14:15:13 +0100 Subject: [PATCH] rootless-install: Add spacing to limit merge conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Assign `CHANNEL` variable between `STABLE_LATEST` and `TEST_LATEST` to spread them apart so they don't appear in diff. This allows to limit merge conflicts when there are two separate PRs that update one of the versions. Signed-off-by: Paweł Gronowski --- rootless-install.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rootless-install.sh b/rootless-install.sh index c61fc63..3eaec72 100755 --- a/rootless-install.sh +++ b/rootless-install.sh @@ -20,6 +20,9 @@ SCRIPT_COMMIT_SHA=UNKNOWN # This script should be run with an unprivileged user and install/setup Docker under $HOME/bin/. +# The latest release is currently hard-coded. +STABLE_LATEST="25.0.5" + # The channel to install from: # * test # * stable @@ -28,9 +31,10 @@ DEFAULT_CHANNEL_VALUE="stable" if [ -z "$CHANNEL" ]; then CHANNEL=$DEFAULT_CHANNEL_VALUE fi -# The latest release is currently hard-coded. -STABLE_LATEST="25.0.5" + +# The test release is currently hard-coded. TEST_LATEST="26.0.0-rc3" + STATIC_RELEASE_URL= STATIC_RELEASE_ROOTLESS_URL= case "$CHANNEL" in