From 0dfa2f60433fe208970b8fd62104e3d8ba9a9f47 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 7 May 2015 11:42:47 -0600 Subject: [PATCH] Update "install.sh" warning to be more verbose See https://github.com/docker/docker/issues/12395#issuecomment-99941300 for some of the context on this one. Signed-off-by: Andrew "Tianon" Page Upstream-commit: fc9ff248c1ccb586297419336b6ad5da640f2bd5 Component: engine --- components/engine/hack/install.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/components/engine/hack/install.sh b/components/engine/hack/install.sh index e15565fc79..1984d5a5fd 100755 --- a/components/engine/hack/install.sh +++ b/components/engine/hack/install.sh @@ -49,11 +49,18 @@ do_install() { ;; esac - if command_exists docker || command_exists lxc-docker; then + if command_exists docker; then cat >&2 <<-'EOF' - Warning: "docker" or "lxc-docker" command appears to already exist. - Please ensure that you do not already have docker installed. - You may press Ctrl+C now to abort this process and rectify this situation. + Warning: the "docker" command appears to already exist on this system. + + If you already have Docker installed, this script can cause trouble, which is + why we're displaying this warning and provide the opportunity to cancel the + installation. + + If you installed the current Docker package using this script and are using it + again to update Docker, you can safely ignore this message. + + You may press Ctrl+C now to abort this script. EOF ( set -x; sleep 20 ) fi