From c3499f5784acecadfbbd4e646714da50ec9c15cb Mon Sep 17 00:00:00 2001
From: Nick Janetakis <nick.janetakis@gmail.com>
Date: Sat, 9 Sep 2023 08:20:28 -0400
Subject: [PATCH] Deprecate the nightly channel

Signed-off-by: Nick Janetakis <nick.janetakis@gmail.com>
---
 install.sh          | 4 ++--
 rootless-install.sh | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index 539d1544..bd0925e5 100755
--- a/install.sh
+++ b/install.sh
@@ -89,7 +89,7 @@ VERSION="${VERSION#v}"
 #   * stable
 #   * test
 #   * edge (deprecated)
-#   * nightly (unmaintained)
+#   * nightly (deprecated)
 DEFAULT_CHANNEL_VALUE="stable"
 if [ -z "$CHANNEL" ]; then
 	CHANNEL=$DEFAULT_CHANNEL_VALUE
@@ -150,7 +150,7 @@ case "$CHANNEL" in
 	stable|test)
 		;;
 	edge|nightly)
-		>&2 echo "DEPRECATED: the $CHANNEL channel has been deprecated and no longer supported by this script."
+		>&2 echo "DEPRECATED: the $CHANNEL channel has been deprecated and is no longer supported by this script."
 		exit 1
 		;;
 	*)
diff --git a/rootless-install.sh b/rootless-install.sh
index 37f71525..7a626c7e 100755
--- a/rootless-install.sh
+++ b/rootless-install.sh
@@ -21,9 +21,9 @@ SCRIPT_COMMIT_SHA=UNKNOWN
 # This script should be run with an unprivileged user and install/setup Docker under $HOME/bin/.
 
 # The channel to install from:
-#   * nightly
 #   * test
 #   * stable
+#   * nightly (deprecated)
 DEFAULT_CHANNEL_VALUE="stable"
 if [ -z "$CHANNEL" ]; then
 	CHANNEL=$DEFAULT_CHANNEL_VALUE
@@ -45,12 +45,10 @@ case "$CHANNEL" in
         STATIC_RELEASE_ROOTLESS_URL="https://download.docker.com/linux/static/$CHANNEL/$(uname -m)/docker-rootless-extras-${TEST_LATEST}.tgz"
         ;;
     "nightly")
-        echo "# Installing nightly"
-        STATIC_RELEASE_URL="https://master.dockerproject.org/linux/$(uname -m)/docker.tgz"
-        STATIC_RELEASE_ROOTLESS_URL="https://master.dockerproject.org/linux/$(uname -m)/docker-rootless-extras.tgz"
+        >&2 echo "DEPRECATED: the nightly channel has been deprecated and is no longer supported by this script."; exit 1
         ;;
     *)
-        >&2 echo "Aborting because of unknown CHANNEL \"$CHANNEL\". Set \$CHANNEL to either \"stable\", \"test\", or \"nightly\"."; exit 1
+        >&2 echo "Aborting because of unknown CHANNEL \"$CHANNEL\". Set \$CHANNEL to either \"stable\" or \"test\"."; exit 1
         ;;
 esac