kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6915 from tstromberg/fish-2x 

docker-env: Add semicolons back for fish, required for fish 2.x users
pull/6924/head
Medya Ghazizadeh 2020-03-06 13:41:02 -08:00 committed by GitHub
parent 987964bbb6 13da35ced2
commit c17e998923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/minikube/cmd/docker-env_test.go
View File

@ -89,18 +89,18 @@ export MINIKUBE_ACTIVE_DOCKERD="ipv6"
"fish", "fish",
DockerEnvConfig{profile: "fish", driver: "kvm2", hostIP: "127.0.0.1", port: 2376, certsDir: "/certs"}, DockerEnvConfig{profile: "fish", driver: "kvm2", hostIP: "127.0.0.1", port: 2376, certsDir: "/certs"},
nil, nil,
`set -gx DOCKER_TLS_VERIFY "1" `set -gx DOCKER_TLS_VERIFY "1";
set -gx DOCKER_HOST "tcp://127.0.0.1:2376" set -gx DOCKER_HOST "tcp://127.0.0.1:2376";
set -gx DOCKER_CERT_PATH "/certs" set -gx DOCKER_CERT_PATH "/certs";
set -gx MINIKUBE_ACTIVE_DOCKERD "fish" set -gx MINIKUBE_ACTIVE_DOCKERD "fish";
# To point your shell to minikube's docker-daemon, run: # To point your shell to minikube's docker-daemon, run:
# minikube -p fish docker-env | source # minikube -p fish docker-env | source
`, `,
`set -e DOCKER_TLS_VERIFY `set -e DOCKER_TLS_VERIFY;
set -e DOCKER_HOST set -e DOCKER_HOST;
set -e DOCKER_CERT_PATH set -e DOCKER_CERT_PATH;
set -e MINIKUBE_ACTIVE_DOCKERD set -e MINIKUBE_ACTIVE_DOCKERD;
`, `,
}, },
{ {

4
pkg/minikube/shell/shell.go
View File

@ -30,11 +30,11 @@ import (
const ( const (
fishSetPfx = "set -gx " fishSetPfx = "set -gx "
fishSetSfx = "\"\n" fishSetSfx = "\";\n" // semi-colon required for fish 2.7
fishSetDelim = " \"" fishSetDelim = " \""
fishUnsetPfx = "set -e " fishUnsetPfx = "set -e "
fishUnsetSfx = "\n" fishUnsetSfx = ";\n"
psSetPfx = "$Env:" psSetPfx = "$Env:"
psSetSfx = "\"\n" psSetSfx = "\"\n"