From 13da35ced2ff3a81c38cef9b401db63edb605262 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Fri, 6 Mar 2020 11:44:30 -0800 Subject: [PATCH] Add semicolons back to fish env, required for fish 2.x users --- cmd/minikube/cmd/docker-env_test.go | 16 ++++++++-------- pkg/minikube/shell/shell.go | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/minikube/cmd/docker-env_test.go b/cmd/minikube/cmd/docker-env_test.go index 17a646c94705..02b0fb0daca2 100644 --- a/cmd/minikube/cmd/docker-env_test.go +++ b/cmd/minikube/cmd/docker-env_test.go @@ -89,18 +89,18 @@ export MINIKUBE_ACTIVE_DOCKERD="ipv6" "fish", DockerEnvConfig{profile: "fish", driver: "kvm2", hostIP: "127.0.0.1", port: 2376, certsDir: "/certs"}, nil, - `set -gx DOCKER_TLS_VERIFY "1" -set -gx DOCKER_HOST "tcp://127.0.0.1:2376" -set -gx DOCKER_CERT_PATH "/certs" -set -gx MINIKUBE_ACTIVE_DOCKERD "fish" + `set -gx DOCKER_TLS_VERIFY "1"; +set -gx DOCKER_HOST "tcp://127.0.0.1:2376"; +set -gx DOCKER_CERT_PATH "/certs"; +set -gx MINIKUBE_ACTIVE_DOCKERD "fish"; # To point your shell to minikube's docker-daemon, run: # minikube -p fish docker-env | source `, - `set -e DOCKER_TLS_VERIFY -set -e DOCKER_HOST -set -e DOCKER_CERT_PATH -set -e MINIKUBE_ACTIVE_DOCKERD + `set -e DOCKER_TLS_VERIFY; +set -e DOCKER_HOST; +set -e DOCKER_CERT_PATH; +set -e MINIKUBE_ACTIVE_DOCKERD; `, }, { diff --git a/pkg/minikube/shell/shell.go b/pkg/minikube/shell/shell.go index 1541b61dd6a9..0a2b02cfdd8a 100644 --- a/pkg/minikube/shell/shell.go +++ b/pkg/minikube/shell/shell.go @@ -30,11 +30,11 @@ import ( const ( fishSetPfx = "set -gx " - fishSetSfx = "\"\n" + fishSetSfx = "\";\n" // semi-colon required for fish 2.7 fishSetDelim = " \"" fishUnsetPfx = "set -e " - fishUnsetSfx = "\n" + fishUnsetSfx = ";\n" psSetPfx = "$Env:" psSetSfx = "\"\n"