fix: Hardened the Docker version checking logic

spaceship-prompt · Jul 13, 2020 · e075f08 · e075f08
1 parent d4642e4
commit e075f08
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/sections/docker.zsh b/sections/docker.zsh
@@ -58,8 +58,10 @@ spaceship_docker() {
   [[ "$compose_exists" == true || -f Dockerfile || -f docker-compose.yml || -f /.dockerenv || -n $docker_context ]] || return
 
   # if docker daemon isn't running you'll get an error saying it can't connect
-  local docker_version=$(docker version -f "{{.Server.Version}}" 2>/dev/null)
-  [[ -z $docker_version ]] && return
+  # Note: Declaration and assignment is separated for correctly getting the exit code
+  local docker_version
+  docker_version=$(docker version -f "{{.Server.Version}}" 2>/dev/null)
+  [[ $? -ne 0 || -z $docker_version ]] && return
 
   [[ $SPACESHIP_DOCKER_VERBOSE == false ]] && docker_version=${docker_version%-*}