From 994922639b5dd20b78ef45888b854632980d2cfd Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Fri, 6 Aug 2021 02:22:46 +0100 Subject: [PATCH] FIX: Don't print error message from which when checking docker install (#549) 'which docker.io || which docker' prints an error message when docker.io is missing, which will be the case on any non-Ubuntu-based system. This is confusing and not actually an error unless _both_ are missing. --- discourse-setup | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/discourse-setup b/discourse-setup index e9537f2..3548feb 100755 --- a/discourse-setup +++ b/discourse-setup @@ -123,15 +123,16 @@ check_IP_match() { ## Do we have docker? ## check_and_install_docker () { - docker_path=`which docker.io || which docker` - if [ -z $docker_path ]; then - read -p "Docker not installed. Enter to install from https://get.docker.com/ or Ctrl+C to exit" + if ! which docker.io docker 2>/dev/null ; then + echo Failed to find docker.io or docker on your PATH. + read -p "Enter to install Docker from https://get.docker.com/ or Ctrl+C to exit" curl https://get.docker.com/ | sh - fi - docker_path=`which docker.io || which docker` - if [ -z $docker_path ]; then - echo Docker install failed. Quitting. - exit + + if ! which docker.io docker 2>/dev/null ; then + echo Still failed to find docker.io or docker on your PATH. + echo Docker install failed. Quitting. + exit + fi fi } -- 2.25.1