Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Fix shellinit output for cmd.exe/powershell#356

Merged
tianon merged 1 commit into from
Mar 26, 2015
Merged

Fix shellinit output for cmd.exe/powershell #356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 59 additions & 17 deletions cmds.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,23 +138,17 @@ func cmdUp() error {
// These errors are not fatal
fmt.Fprintf(os.Stderr, "Warning: error copying certificates: %s\n", err)
}
switch runtime.GOOS {
case "windows":
fmt.Printf("Docker client does not run on Windows for now. Please use\n")
fmt.Printf(" \"%s\" ssh\n", os.Args[0])
fmt.Printf("to SSH into the VM instead.\n")
default:
if socket == "" {
fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")

if socket == "" {
fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")
} else {
// Check if $DOCKER_* ENV vars are properly configured.
if !checkEnvironment(socket, certPath) {
fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
printExport(socket, certPath)
} else {
// Check if $DOCKER_* ENV vars are properly configured.
if !checkEnvironment(socket, certPath) {
fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
printExport(socket, certPath)
} else {
fmt.Printf("Your environment variables are already set correctly.\n")
}
fmt.Printf("Your environment variables are already set correctly.\n")
}
}
fmt.Printf("\n")
Expand DownExpand Up@@ -189,6 +183,7 @@ func cmdShellInit() error {

func checkEnvironment(socket, certPath string) bool {
for name, value := range exports(socket, certPath) {
value = strings.Trim(value, `"'`) // remove surrounding quotes
if os.Getenv(name) != value {
return false
}
Expand All@@ -198,7 +193,20 @@ func checkEnvironment(socket, certPath string) bool {
}

func printExport(socket, certPath string) {
for name, value := range exports(socket, certPath) {
values := exports(socket, certPath)
if runtime.GOOS == "windows" && !isUnixShellOnWindows() {
printExportWindows(values)
} else {
printExportUnix(values)
}
}

func isUnixShellOnWindows() bool {
return os.Getenv("TERM") != ""
}

func printExportUnix(values map[string]string) {
for name, value := range values {
switch filepath.Base(os.Getenv("SHELL")) {
case "fish":
if value == "" {
Expand All@@ -216,12 +224,46 @@ func printExport(socket, certPath string) {
}
}

func printExportWindows(values map[string]string) {
// Print cmd.exe instructions to stderr
fmt.Fprintln(os.Stderr, "If you are running inside Windows Command Prompt (cmd.exe), copy and paste the")
fmt.Fprintln(os.Stderr, "following commands to your terminal to set the environment variables:")
for name, value := range values {
if value == "" {
fmt.Fprintf(os.Stderr, " set %s=\n", name)
} else {
fmt.Fprintf(os.Stderr, " set %s=%s\n", name, value)
}
}
fmt.Fprintln(os.Stderr, "")
// Print powershell instructions to stderr
fmt.Fprintln(os.Stderr, "If you are running inside PowerShell, copy or paste the following commands")
fmt.Fprintln(os.Stderr, `to your shell or run "boot2docker shellinit | Invoke-Expression" to set the`)
fmt.Fprintln(os.Stderr, "environment variables:")

// Print powershell exports to stdout
for name, value := range values {
if value == "" {
fmt.Printf(" Remove-Item Env:\\%s\n", name)
} else {
fmt.Printf(" $Env:%s = \"%s\"\n", name, value)

@gmlewisgmlewisMar 25, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could be: (also, there are a number of other places that could use Println instead of Printf... but not a big deal.)

fmt.Println(` $Env:%s = "%s"`, name, value)

@ahmetbahmetbMar 25, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis this particular one is easy to fix. I'll just fix. Problem was mostly above where I can't have \n inside backticks with fmt.Fprintf. thanks.

@tianontianonMar 25, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fmt.Println doesn't take a format string, does it?

@ahmetbahmetbMar 25, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis oh wait I can't fix this too, if I use Println I can't format %s 😄

@tianontianonMar 25, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://golang.org/pkg/fmt/#Println

Println formats using the default formats for its operands and writes to standard output. Spaces are always added between operands and a newline is appended. It returns the number of bytes written and any write error encountered.

@ahmetbahmetbMar 25, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tianon

fmt.Println(" $Env:"+name, "=", `"`+value+`"`)

this looks ugly.

@tianontianonMar 25, 2015 via email

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewisgmlewisMar 25, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://godoc.org/fmt#Println supports formatting. What I wrote should work, and IMHO looks best.

@ahmetbahmetbMar 25, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis nope it doesn't http://play.golang.org/p/nCpc584yVw

@gmlewisgmlewisMar 26, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, sorry. My bad.

}
}
}

func exports(socket, certPath string) map[string]string {
out := make(map[string]string)

out["DOCKER_HOST"] = socket
out["DOCKER_CERT_PATH"] = certPath

if runtime.GOOS == "windows" && isUnixShellOnWindows() {
// Surround Windows-style paths with single quotes in exported path otherwise
// bash swallows the backslashes in export statements like:
// export DOCKER_CERT_PATH=C:\Users\ahmet\.boot2docker\certs\boot2docker-vm
out["DOCKER_CERT_PATH"] = fmt.Sprintf("'%s'", out["DOCKER_CERT_PATH"])
}

if certPath == "" {
out["DOCKER_TLS_VERIFY"] = ""
} else {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix shellinit output for cmd.exe/powershell by ahmetb · Pull Request #356 · boot2docker/boot2docker-cli · GitHub
Skip to content

This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Fix shellinit output for cmd.exe/powershell#356
 Merged

tianon
merged 1 commit into

from

Mar 26, 2015
 Merged


Fix shellinit output for cmd.exe/powershell
#356
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 59 additions & 17 deletions
cmds.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,23 +138,17 @@ func cmdUp() error {
 // These errors are not fatal
 fmt.Fprintf(os.Stderr, "Warning: error copying certificates: %s\n", err)
	}
	switch runtime.GOOS {
case "windows":
 fmt.Printf("Docker client does not run on Windows for now. Please use\n")
 fmt.Printf(" \"%s\" ssh\n", os.Args[0])
	fmt.Printf("to SSH into the VM instead.\n")
default:
 if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")

if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
 fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")
} else {
	// Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
printExport(socket, certPath)
 } else {
 // Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
 printExport(socket, certPath)
 } else {
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
	}
	fmt.Printf("\n")
Expand DownExpand Up@@ -189,6 +183,7 @@ func cmdShellInit() error {

func checkEnvironment(socket, certPath string) bool {
	for name, value := range exports(socket, certPath) {
 value = strings.Trim(value, `"'`) // remove surrounding quotes
 if os.Getenv(name) != value {
 return false
 }
Expand All@@ -198,7 +193,20 @@ func checkEnvironment(socket, certPath string) bool {
}

func printExport(socket, certPath string) {
	for name, value := range exports(socket, certPath) {
	values := exports(socket, certPath)
	if runtime.GOOS == "windows" && !isUnixShellOnWindows() {
 printExportWindows(values)
	} else {
 printExportUnix(values)
	}
}

func isUnixShellOnWindows() bool {
	return os.Getenv("TERM") != ""
}

func printExportUnix(values map[string]string) {
	for name, value := range values {
 switch filepath.Base(os.Getenv("SHELL")) {
 case "fish":
 if value == "" {
Expand All@@ -216,12 +224,46 @@ func printExport(socket, certPath string) {
	}
}

func printExportWindows(values map[string]string) {
	// Print cmd.exe instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside Windows Command Prompt (cmd.exe), copy and paste the")
	fmt.Fprintln(os.Stderr, "following commands to your terminal to set the environment variables:")
	for name, value := range values {
 if value == "" {
 fmt.Fprintf(os.Stderr, " set %s=\n", name)
 } else {
 fmt.Fprintf(os.Stderr, " set %s=%s\n", name, value)
 }
	}
	fmt.Fprintln(os.Stderr, "")
	// Print powershell instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside PowerShell, copy or paste the following commands")
	fmt.Fprintln(os.Stderr, `to your shell or run "boot2docker shellinit | Invoke-Expression" to set the`)
	fmt.Fprintln(os.Stderr, "environment variables:")

	// Print powershell exports to stdout
	for name, value := range values {
 if value == "" {
 fmt.Printf(" Remove-Item Env:\\%s\n", name)
 } else {
 fmt.Printf(" $Env:%s = \"%s\"\n", name, value)
@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could be: (also, there are a number of other places that could use Println instead of Printf... but not a big deal.)
fmt.Println(` $Env:%s = "%s"`, name, value)
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis this particular one is easy to fix. I'll just fix. Problem was mostly above where I can't have \n inside backticks with fmt.Fprintf. thanks.
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fmt.Println doesn't take a format string, does it?
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis oh wait I can't fix this too, if I use Println I can't format %s 😄
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://golang.org/pkg/fmt/#Println
Println formats using the default formats for its operands and writes to standard output. Spaces are always added between operands and a newline is appended. It returns the number of bytes written and any write error encountered.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tianon
fmt.Println(" $Env:"+name, "=", `"`+value+`"`)
this looks ugly.
@tianontianonMar 25, 2015
via email 

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://godoc.org/fmt#Println supports formatting. What I wrote should work, and IMHO looks best.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis nope it doesn't http://play.golang.org/p/nCpc584yVw
@gmlewisgmlewisMar 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, sorry. My bad.
 }
	}
}

func exports(socket, certPath string) map[string]string {
	out := make(map[string]string)

	out["DOCKER_HOST"] = socket
	out["DOCKER_CERT_PATH"] = certPath

	if runtime.GOOS == "windows" && isUnixShellOnWindows() {
 // Surround Windows-style paths with single quotes in exported path otherwise
 // bash swallows the backslashes in export statements like:
 // export DOCKER_CERT_PATH=C:\Users\ahmet\.boot2docker\certs\boot2docker-vm
 out["DOCKER_CERT_PATH"] = fmt.Sprintf("'%s'", out["DOCKER_CERT_PATH"])
	}

	if certPath == "" {
 out["DOCKER_TLS_VERIFY"] = ""
	} else {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix shellinit output for cmd.exe/powershell by ahmetb · Pull Request #356 · boot2docker/boot2docker-cli · GitHub
Skip to content

This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Fix shellinit output for cmd.exe/powershell#356
 Merged

tianon
merged 1 commit into

from

Mar 26, 2015
 Merged


Fix shellinit output for cmd.exe/powershell
#356
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 59 additions & 17 deletions
cmds.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,23 +138,17 @@ func cmdUp() error {
 // These errors are not fatal
 fmt.Fprintf(os.Stderr, "Warning: error copying certificates: %s\n", err)
	}
	switch runtime.GOOS {
case "windows":
 fmt.Printf("Docker client does not run on Windows for now. Please use\n")
 fmt.Printf(" \"%s\" ssh\n", os.Args[0])
	fmt.Printf("to SSH into the VM instead.\n")
default:
 if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")

if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
 fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")
} else {
	// Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
printExport(socket, certPath)
 } else {
 // Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
 printExport(socket, certPath)
 } else {
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
	}
	fmt.Printf("\n")
Expand DownExpand Up@@ -189,6 +183,7 @@ func cmdShellInit() error {

func checkEnvironment(socket, certPath string) bool {
	for name, value := range exports(socket, certPath) {
 value = strings.Trim(value, `"'`) // remove surrounding quotes
 if os.Getenv(name) != value {
 return false
 }
Expand All@@ -198,7 +193,20 @@ func checkEnvironment(socket, certPath string) bool {
}

func printExport(socket, certPath string) {
	for name, value := range exports(socket, certPath) {
	values := exports(socket, certPath)
	if runtime.GOOS == "windows" && !isUnixShellOnWindows() {
 printExportWindows(values)
	} else {
 printExportUnix(values)
	}
}

func isUnixShellOnWindows() bool {
	return os.Getenv("TERM") != ""
}

func printExportUnix(values map[string]string) {
	for name, value := range values {
 switch filepath.Base(os.Getenv("SHELL")) {
 case "fish":
 if value == "" {
Expand All@@ -216,12 +224,46 @@ func printExport(socket, certPath string) {
	}
}

func printExportWindows(values map[string]string) {
	// Print cmd.exe instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside Windows Command Prompt (cmd.exe), copy and paste the")
	fmt.Fprintln(os.Stderr, "following commands to your terminal to set the environment variables:")
	for name, value := range values {
 if value == "" {
 fmt.Fprintf(os.Stderr, " set %s=\n", name)
 } else {
 fmt.Fprintf(os.Stderr, " set %s=%s\n", name, value)
 }
	}
	fmt.Fprintln(os.Stderr, "")
	// Print powershell instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside PowerShell, copy or paste the following commands")
	fmt.Fprintln(os.Stderr, `to your shell or run "boot2docker shellinit | Invoke-Expression" to set the`)
	fmt.Fprintln(os.Stderr, "environment variables:")

	// Print powershell exports to stdout
	for name, value := range values {
 if value == "" {
 fmt.Printf(" Remove-Item Env:\\%s\n", name)
 } else {
 fmt.Printf(" $Env:%s = \"%s\"\n", name, value)
@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could be: (also, there are a number of other places that could use Println instead of Printf... but not a big deal.)
fmt.Println(` $Env:%s = "%s"`, name, value)
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis this particular one is easy to fix. I'll just fix. Problem was mostly above where I can't have \n inside backticks with fmt.Fprintf. thanks.
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fmt.Println doesn't take a format string, does it?
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis oh wait I can't fix this too, if I use Println I can't format %s 😄
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://golang.org/pkg/fmt/#Println
Println formats using the default formats for its operands and writes to standard output. Spaces are always added between operands and a newline is appended. It returns the number of bytes written and any write error encountered.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tianon
fmt.Println(" $Env:"+name, "=", `"`+value+`"`)
this looks ugly.
@tianontianonMar 25, 2015
via email 

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://godoc.org/fmt#Println supports formatting. What I wrote should work, and IMHO looks best.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis nope it doesn't http://play.golang.org/p/nCpc584yVw
@gmlewisgmlewisMar 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, sorry. My bad.
 }
	}
}

func exports(socket, certPath string) map[string]string {
	out := make(map[string]string)

	out["DOCKER_HOST"] = socket
	out["DOCKER_CERT_PATH"] = certPath

	if runtime.GOOS == "windows" && isUnixShellOnWindows() {
 // Surround Windows-style paths with single quotes in exported path otherwise
 // bash swallows the backslashes in export statements like:
 // export DOCKER_CERT_PATH=C:\Users\ahmet\.boot2docker\certs\boot2docker-vm
 out["DOCKER_CERT_PATH"] = fmt.Sprintf("'%s'", out["DOCKER_CERT_PATH"])
	}

	if certPath == "" {
 out["DOCKER_TLS_VERIFY"] = ""
	} else {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix shellinit output for cmd.exe/powershell by ahmetb · Pull Request #356 · boot2docker/boot2docker-cli · GitHub
Skip to content

This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Fix shellinit output for cmd.exe/powershell#356
 Merged

tianon
merged 1 commit into

from

Mar 26, 2015
 Merged


Fix shellinit output for cmd.exe/powershell
#356
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 59 additions & 17 deletions
cmds.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,23 +138,17 @@ func cmdUp() error {
 // These errors are not fatal
 fmt.Fprintf(os.Stderr, "Warning: error copying certificates: %s\n", err)
	}
	switch runtime.GOOS {
case "windows":
 fmt.Printf("Docker client does not run on Windows for now. Please use\n")
 fmt.Printf(" \"%s\" ssh\n", os.Args[0])
	fmt.Printf("to SSH into the VM instead.\n")
default:
 if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")

if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
 fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")
} else {
	// Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
printExport(socket, certPath)
 } else {
 // Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
 printExport(socket, certPath)
 } else {
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
	}
	fmt.Printf("\n")
Expand DownExpand Up@@ -189,6 +183,7 @@ func cmdShellInit() error {

func checkEnvironment(socket, certPath string) bool {
	for name, value := range exports(socket, certPath) {
 value = strings.Trim(value, `"'`) // remove surrounding quotes
 if os.Getenv(name) != value {
 return false
 }
Expand All@@ -198,7 +193,20 @@ func checkEnvironment(socket, certPath string) bool {
}

func printExport(socket, certPath string) {
	for name, value := range exports(socket, certPath) {
	values := exports(socket, certPath)
	if runtime.GOOS == "windows" && !isUnixShellOnWindows() {
 printExportWindows(values)
	} else {
 printExportUnix(values)
	}
}

func isUnixShellOnWindows() bool {
	return os.Getenv("TERM") != ""
}

func printExportUnix(values map[string]string) {
	for name, value := range values {
 switch filepath.Base(os.Getenv("SHELL")) {
 case "fish":
 if value == "" {
Expand All@@ -216,12 +224,46 @@ func printExport(socket, certPath string) {
	}
}

func printExportWindows(values map[string]string) {
	// Print cmd.exe instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside Windows Command Prompt (cmd.exe), copy and paste the")
	fmt.Fprintln(os.Stderr, "following commands to your terminal to set the environment variables:")
	for name, value := range values {
 if value == "" {
 fmt.Fprintf(os.Stderr, " set %s=\n", name)
 } else {
 fmt.Fprintf(os.Stderr, " set %s=%s\n", name, value)
 }
	}
	fmt.Fprintln(os.Stderr, "")
	// Print powershell instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside PowerShell, copy or paste the following commands")
	fmt.Fprintln(os.Stderr, `to your shell or run "boot2docker shellinit | Invoke-Expression" to set the`)
	fmt.Fprintln(os.Stderr, "environment variables:")

	// Print powershell exports to stdout
	for name, value := range values {
 if value == "" {
 fmt.Printf(" Remove-Item Env:\\%s\n", name)
 } else {
 fmt.Printf(" $Env:%s = \"%s\"\n", name, value)
@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could be: (also, there are a number of other places that could use Println instead of Printf... but not a big deal.)
fmt.Println(` $Env:%s = "%s"`, name, value)
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis this particular one is easy to fix. I'll just fix. Problem was mostly above where I can't have \n inside backticks with fmt.Fprintf. thanks.
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fmt.Println doesn't take a format string, does it?
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis oh wait I can't fix this too, if I use Println I can't format %s 😄
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://golang.org/pkg/fmt/#Println
Println formats using the default formats for its operands and writes to standard output. Spaces are always added between operands and a newline is appended. It returns the number of bytes written and any write error encountered.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tianon
fmt.Println(" $Env:"+name, "=", `"`+value+`"`)
this looks ugly.
@tianontianonMar 25, 2015
via email 

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://godoc.org/fmt#Println supports formatting. What I wrote should work, and IMHO looks best.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis nope it doesn't http://play.golang.org/p/nCpc584yVw
@gmlewisgmlewisMar 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, sorry. My bad.
 }
	}
}

func exports(socket, certPath string) map[string]string {
	out := make(map[string]string)

	out["DOCKER_HOST"] = socket
	out["DOCKER_CERT_PATH"] = certPath

	if runtime.GOOS == "windows" && isUnixShellOnWindows() {
 // Surround Windows-style paths with single quotes in exported path otherwise
 // bash swallows the backslashes in export statements like:
 // export DOCKER_CERT_PATH=C:\Users\ahmet\.boot2docker\certs\boot2docker-vm
 out["DOCKER_CERT_PATH"] = fmt.Sprintf("'%s'", out["DOCKER_CERT_PATH"])
	}

	if certPath == "" {
 out["DOCKER_TLS_VERIFY"] = ""
	} else {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Fix shellinit output for cmd.exe/powershell by ahmetb · Pull Request #356 · boot2docker/boot2docker-cli · GitHub
Skip to content

This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Fix shellinit output for cmd.exe/powershell#356
 Merged

tianon
merged 1 commit into

from

Mar 26, 2015
 Merged


Fix shellinit output for cmd.exe/powershell
#356
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 59 additions & 17 deletions
cmds.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,23 +138,17 @@ func cmdUp() error {
 // These errors are not fatal
 fmt.Fprintf(os.Stderr, "Warning: error copying certificates: %s\n", err)
	}
	switch runtime.GOOS {
case "windows":
 fmt.Printf("Docker client does not run on Windows for now. Please use\n")
 fmt.Printf(" \"%s\" ssh\n", os.Args[0])
	fmt.Printf("to SSH into the VM instead.\n")
default:
 if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")

if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
 fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")
} else {
	// Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
printExport(socket, certPath)
 } else {
 // Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
 printExport(socket, certPath)
 } else {
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
	}
	fmt.Printf("\n")
Expand DownExpand Up@@ -189,6 +183,7 @@ func cmdShellInit() error {

func checkEnvironment(socket, certPath string) bool {
	for name, value := range exports(socket, certPath) {
 value = strings.Trim(value, `"'`) // remove surrounding quotes
 if os.Getenv(name) != value {
 return false
 }
Expand All@@ -198,7 +193,20 @@ func checkEnvironment(socket, certPath string) bool {
}

func printExport(socket, certPath string) {
	for name, value := range exports(socket, certPath) {
	values := exports(socket, certPath)
	if runtime.GOOS == "windows" && !isUnixShellOnWindows() {
 printExportWindows(values)
	} else {
 printExportUnix(values)
	}
}

func isUnixShellOnWindows() bool {
	return os.Getenv("TERM") != ""
}

func printExportUnix(values map[string]string) {
	for name, value := range values {
 switch filepath.Base(os.Getenv("SHELL")) {
 case "fish":
 if value == "" {
Expand All@@ -216,12 +224,46 @@ func printExport(socket, certPath string) {
	}
}

func printExportWindows(values map[string]string) {
	// Print cmd.exe instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside Windows Command Prompt (cmd.exe), copy and paste the")
	fmt.Fprintln(os.Stderr, "following commands to your terminal to set the environment variables:")
	for name, value := range values {
 if value == "" {
 fmt.Fprintf(os.Stderr, " set %s=\n", name)
 } else {
 fmt.Fprintf(os.Stderr, " set %s=%s\n", name, value)
 }
	}
	fmt.Fprintln(os.Stderr, "")
	// Print powershell instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside PowerShell, copy or paste the following commands")
	fmt.Fprintln(os.Stderr, `to your shell or run "boot2docker shellinit | Invoke-Expression" to set the`)
	fmt.Fprintln(os.Stderr, "environment variables:")

	// Print powershell exports to stdout
	for name, value := range values {
 if value == "" {
 fmt.Printf(" Remove-Item Env:\\%s\n", name)
 } else {
 fmt.Printf(" $Env:%s = \"%s\"\n", name, value)
@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could be: (also, there are a number of other places that could use Println instead of Printf... but not a big deal.)
fmt.Println(` $Env:%s = "%s"`, name, value)
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis this particular one is easy to fix. I'll just fix. Problem was mostly above where I can't have \n inside backticks with fmt.Fprintf. thanks.
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fmt.Println doesn't take a format string, does it?
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis oh wait I can't fix this too, if I use Println I can't format %s 😄
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://golang.org/pkg/fmt/#Println
Println formats using the default formats for its operands and writes to standard output. Spaces are always added between operands and a newline is appended. It returns the number of bytes written and any write error encountered.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tianon
fmt.Println(" $Env:"+name, "=", `"`+value+`"`)
this looks ugly.
@tianontianonMar 25, 2015
via email 

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://godoc.org/fmt#Println supports formatting. What I wrote should work, and IMHO looks best.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis nope it doesn't http://play.golang.org/p/nCpc584yVw
@gmlewisgmlewisMar 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, sorry. My bad.
 }
	}
}

func exports(socket, certPath string) map[string]string {
	out := make(map[string]string)

	out["DOCKER_HOST"] = socket
	out["DOCKER_CERT_PATH"] = certPath

	if runtime.GOOS == "windows" && isUnixShellOnWindows() {
 // Surround Windows-style paths with single quotes in exported path otherwise
 // bash swallows the backslashes in export statements like:
 // export DOCKER_CERT_PATH=C:\Users\ahmet\.boot2docker\certs\boot2docker-vm
 out["DOCKER_CERT_PATH"] = fmt.Sprintf("'%s'", out["DOCKER_CERT_PATH"])
	}

	if certPath == "" {
 out["DOCKER_TLS_VERIFY"] = ""
	} else {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix shellinit output for cmd.exe/powershell by ahmetb · Pull Request #356 · boot2docker/boot2docker-cli · GitHub
Skip to content

This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Fix shellinit output for cmd.exe/powershell#356
 Merged

tianon
merged 1 commit into

from

Mar 26, 2015
 Merged


Fix shellinit output for cmd.exe/powershell
#356
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 59 additions & 17 deletions
cmds.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,23 +138,17 @@ func cmdUp() error {
 // These errors are not fatal
 fmt.Fprintf(os.Stderr, "Warning: error copying certificates: %s\n", err)
	}
	switch runtime.GOOS {
case "windows":
 fmt.Printf("Docker client does not run on Windows for now. Please use\n")
 fmt.Printf(" \"%s\" ssh\n", os.Args[0])
	fmt.Printf("to SSH into the VM instead.\n")
default:
 if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")

if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
 fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")
} else {
	// Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
printExport(socket, certPath)
 } else {
 // Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
 printExport(socket, certPath)
 } else {
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
	}
	fmt.Printf("\n")
Expand DownExpand Up@@ -189,6 +183,7 @@ func cmdShellInit() error {

func checkEnvironment(socket, certPath string) bool {
	for name, value := range exports(socket, certPath) {
 value = strings.Trim(value, `"'`) // remove surrounding quotes
 if os.Getenv(name) != value {
 return false
 }
Expand All@@ -198,7 +193,20 @@ func checkEnvironment(socket, certPath string) bool {
}

func printExport(socket, certPath string) {
	for name, value := range exports(socket, certPath) {
	values := exports(socket, certPath)
	if runtime.GOOS == "windows" && !isUnixShellOnWindows() {
 printExportWindows(values)
	} else {
 printExportUnix(values)
	}
}

func isUnixShellOnWindows() bool {
	return os.Getenv("TERM") != ""
}

func printExportUnix(values map[string]string) {
	for name, value := range values {
 switch filepath.Base(os.Getenv("SHELL")) {
 case "fish":
 if value == "" {
Expand All@@ -216,12 +224,46 @@ func printExport(socket, certPath string) {
	}
}

func printExportWindows(values map[string]string) {
	// Print cmd.exe instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside Windows Command Prompt (cmd.exe), copy and paste the")
	fmt.Fprintln(os.Stderr, "following commands to your terminal to set the environment variables:")
	for name, value := range values {
 if value == "" {
 fmt.Fprintf(os.Stderr, " set %s=\n", name)
 } else {
 fmt.Fprintf(os.Stderr, " set %s=%s\n", name, value)
 }
	}
	fmt.Fprintln(os.Stderr, "")
	// Print powershell instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside PowerShell, copy or paste the following commands")
	fmt.Fprintln(os.Stderr, `to your shell or run "boot2docker shellinit | Invoke-Expression" to set the`)
	fmt.Fprintln(os.Stderr, "environment variables:")

	// Print powershell exports to stdout
	for name, value := range values {
 if value == "" {
 fmt.Printf(" Remove-Item Env:\\%s\n", name)
 } else {
 fmt.Printf(" $Env:%s = \"%s\"\n", name, value)
@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could be: (also, there are a number of other places that could use Println instead of Printf... but not a big deal.)
fmt.Println(` $Env:%s = "%s"`, name, value)
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis this particular one is easy to fix. I'll just fix. Problem was mostly above where I can't have \n inside backticks with fmt.Fprintf. thanks.
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fmt.Println doesn't take a format string, does it?
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis oh wait I can't fix this too, if I use Println I can't format %s 😄
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://golang.org/pkg/fmt/#Println
Println formats using the default formats for its operands and writes to standard output. Spaces are always added between operands and a newline is appended. It returns the number of bytes written and any write error encountered.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tianon
fmt.Println(" $Env:"+name, "=", `"`+value+`"`)
this looks ugly.
@tianontianonMar 25, 2015
via email 

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://godoc.org/fmt#Println supports formatting. What I wrote should work, and IMHO looks best.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis nope it doesn't http://play.golang.org/p/nCpc584yVw
@gmlewisgmlewisMar 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, sorry. My bad.
 }
	}
}

func exports(socket, certPath string) map[string]string {
	out := make(map[string]string)

	out["DOCKER_HOST"] = socket
	out["DOCKER_CERT_PATH"] = certPath

	if runtime.GOOS == "windows" && isUnixShellOnWindows() {
 // Surround Windows-style paths with single quotes in exported path otherwise
 // bash swallows the backslashes in export statements like:
 // export DOCKER_CERT_PATH=C:\Users\ahmet\.boot2docker\certs\boot2docker-vm
 out["DOCKER_CERT_PATH"] = fmt.Sprintf("'%s'", out["DOCKER_CERT_PATH"])
	}

	if certPath == "" {
 out["DOCKER_TLS_VERIFY"] = ""
	} else {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix shellinit output for cmd.exe/powershell by ahmetb · Pull Request #356 · boot2docker/boot2docker-cli · GitHub
Skip to content

This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Fix shellinit output for cmd.exe/powershell#356
 Merged

tianon
merged 1 commit into

from

Mar 26, 2015
 Merged


Fix shellinit output for cmd.exe/powershell
#356
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 59 additions & 17 deletions
cmds.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,23 +138,17 @@ func cmdUp() error {
 // These errors are not fatal
 fmt.Fprintf(os.Stderr, "Warning: error copying certificates: %s\n", err)
	}
	switch runtime.GOOS {
case "windows":
 fmt.Printf("Docker client does not run on Windows for now. Please use\n")
 fmt.Printf(" \"%s\" ssh\n", os.Args[0])
	fmt.Printf("to SSH into the VM instead.\n")
default:
 if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")

if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
 fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")
} else {
	// Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
printExport(socket, certPath)
 } else {
 // Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
 printExport(socket, certPath)
 } else {
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
	}
	fmt.Printf("\n")
Expand DownExpand Up@@ -189,6 +183,7 @@ func cmdShellInit() error {

func checkEnvironment(socket, certPath string) bool {
	for name, value := range exports(socket, certPath) {
 value = strings.Trim(value, `"'`) // remove surrounding quotes
 if os.Getenv(name) != value {
 return false
 }
Expand All@@ -198,7 +193,20 @@ func checkEnvironment(socket, certPath string) bool {
}

func printExport(socket, certPath string) {
	for name, value := range exports(socket, certPath) {
	values := exports(socket, certPath)
	if runtime.GOOS == "windows" && !isUnixShellOnWindows() {
 printExportWindows(values)
	} else {
 printExportUnix(values)
	}
}

func isUnixShellOnWindows() bool {
	return os.Getenv("TERM") != ""
}

func printExportUnix(values map[string]string) {
	for name, value := range values {
 switch filepath.Base(os.Getenv("SHELL")) {
 case "fish":
 if value == "" {
Expand All@@ -216,12 +224,46 @@ func printExport(socket, certPath string) {
	}
}

func printExportWindows(values map[string]string) {
	// Print cmd.exe instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside Windows Command Prompt (cmd.exe), copy and paste the")
	fmt.Fprintln(os.Stderr, "following commands to your terminal to set the environment variables:")
	for name, value := range values {
 if value == "" {
 fmt.Fprintf(os.Stderr, " set %s=\n", name)
 } else {
 fmt.Fprintf(os.Stderr, " set %s=%s\n", name, value)
 }
	}
	fmt.Fprintln(os.Stderr, "")
	// Print powershell instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside PowerShell, copy or paste the following commands")
	fmt.Fprintln(os.Stderr, `to your shell or run "boot2docker shellinit | Invoke-Expression" to set the`)
	fmt.Fprintln(os.Stderr, "environment variables:")

	// Print powershell exports to stdout
	for name, value := range values {
 if value == "" {
 fmt.Printf(" Remove-Item Env:\\%s\n", name)
 } else {
 fmt.Printf(" $Env:%s = \"%s\"\n", name, value)
@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could be: (also, there are a number of other places that could use Println instead of Printf... but not a big deal.)
fmt.Println(` $Env:%s = "%s"`, name, value)
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis this particular one is easy to fix. I'll just fix. Problem was mostly above where I can't have \n inside backticks with fmt.Fprintf. thanks.
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fmt.Println doesn't take a format string, does it?
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis oh wait I can't fix this too, if I use Println I can't format %s 😄
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://golang.org/pkg/fmt/#Println
Println formats using the default formats for its operands and writes to standard output. Spaces are always added between operands and a newline is appended. It returns the number of bytes written and any write error encountered.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tianon
fmt.Println(" $Env:"+name, "=", `"`+value+`"`)
this looks ugly.
@tianontianonMar 25, 2015
via email 

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://godoc.org/fmt#Println supports formatting. What I wrote should work, and IMHO looks best.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis nope it doesn't http://play.golang.org/p/nCpc584yVw
@gmlewisgmlewisMar 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, sorry. My bad.
 }
	}
}

func exports(socket, certPath string) map[string]string {
	out := make(map[string]string)

	out["DOCKER_HOST"] = socket
	out["DOCKER_CERT_PATH"] = certPath

	if runtime.GOOS == "windows" && isUnixShellOnWindows() {
 // Surround Windows-style paths with single quotes in exported path otherwise
 // bash swallows the backslashes in export statements like:
 // export DOCKER_CERT_PATH=C:\Users\ahmet\.boot2docker\certs\boot2docker-vm
 out["DOCKER_CERT_PATH"] = fmt.Sprintf("'%s'", out["DOCKER_CERT_PATH"])
	}

	if certPath == "" {
 out["DOCKER_TLS_VERIFY"] = ""
	} else {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Fix shellinit output for cmd.exe/powershell by ahmetb · Pull Request #356 · boot2docker/boot2docker-cli · GitHub
Skip to content

This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Fix shellinit output for cmd.exe/powershell#356
 Merged

tianon
merged 1 commit into

from

Mar 26, 2015
 Merged


Fix shellinit output for cmd.exe/powershell
#356
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 59 additions & 17 deletions
cmds.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,23 +138,17 @@ func cmdUp() error {
 // These errors are not fatal
 fmt.Fprintf(os.Stderr, "Warning: error copying certificates: %s\n", err)
	}
	switch runtime.GOOS {
case "windows":
 fmt.Printf("Docker client does not run on Windows for now. Please use\n")
 fmt.Printf(" \"%s\" ssh\n", os.Args[0])
	fmt.Printf("to SSH into the VM instead.\n")
default:
 if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")

if socket == "" {
 fmt.Fprintf(os.Stderr, "Auto detection of the VM's Docker socket failed.\n")
 fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")
} else {
	// Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
printExport(socket, certPath)
 } else {
 // Check if $DOCKER_* ENV vars are properly configured.
 if !checkEnvironment(socket, certPath) {
 fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
 printExport(socket, certPath)
 } else {
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
 fmt.Printf("Your environment variables are already set correctly.\n")
 }
	}
	fmt.Printf("\n")
Expand DownExpand Up@@ -189,6 +183,7 @@ func cmdShellInit() error {

func checkEnvironment(socket, certPath string) bool {
	for name, value := range exports(socket, certPath) {
 value = strings.Trim(value, `"'`) // remove surrounding quotes
 if os.Getenv(name) != value {
 return false
 }
Expand All@@ -198,7 +193,20 @@ func checkEnvironment(socket, certPath string) bool {
}

func printExport(socket, certPath string) {
	for name, value := range exports(socket, certPath) {
	values := exports(socket, certPath)
	if runtime.GOOS == "windows" && !isUnixShellOnWindows() {
 printExportWindows(values)
	} else {
 printExportUnix(values)
	}
}

func isUnixShellOnWindows() bool {
	return os.Getenv("TERM") != ""
}

func printExportUnix(values map[string]string) {
	for name, value := range values {
 switch filepath.Base(os.Getenv("SHELL")) {
 case "fish":
 if value == "" {
Expand All@@ -216,12 +224,46 @@ func printExport(socket, certPath string) {
	}
}

func printExportWindows(values map[string]string) {
	// Print cmd.exe instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside Windows Command Prompt (cmd.exe), copy and paste the")
	fmt.Fprintln(os.Stderr, "following commands to your terminal to set the environment variables:")
	for name, value := range values {
 if value == "" {
 fmt.Fprintf(os.Stderr, " set %s=\n", name)
 } else {
 fmt.Fprintf(os.Stderr, " set %s=%s\n", name, value)
 }
	}
	fmt.Fprintln(os.Stderr, "")
	// Print powershell instructions to stderr
	fmt.Fprintln(os.Stderr, "If you are running inside PowerShell, copy or paste the following commands")
	fmt.Fprintln(os.Stderr, `to your shell or run "boot2docker shellinit | Invoke-Expression" to set the`)
	fmt.Fprintln(os.Stderr, "environment variables:")

	// Print powershell exports to stdout
	for name, value := range values {
 if value == "" {
 fmt.Printf(" Remove-Item Env:\\%s\n", name)
 } else {
 fmt.Printf(" $Env:%s = \"%s\"\n", name, value)
@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could be: (also, there are a number of other places that could use Println instead of Printf... but not a big deal.)
fmt.Println(` $Env:%s = "%s"`, name, value)
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis this particular one is easy to fix. I'll just fix. Problem was mostly above where I can't have \n inside backticks with fmt.Fprintf. thanks.
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fmt.Println doesn't take a format string, does it?
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis oh wait I can't fix this too, if I use Println I can't format %s 😄
@tianontianonMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://golang.org/pkg/fmt/#Println
Println formats using the default formats for its operands and writes to standard output. Spaces are always added between operands and a newline is appended. It returns the number of bytes written and any write error encountered.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tianon
fmt.Println(" $Env:"+name, "=", `"`+value+`"`)
this looks ugly.
@tianontianonMar 25, 2015
via email 

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewisgmlewisMar 25, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://godoc.org/fmt#Println supports formatting. What I wrote should work, and IMHO looks best.
@ahmetbahmetbMar 25, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gmlewis nope it doesn't http://play.golang.org/p/nCpc584yVw
@gmlewisgmlewisMar 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, sorry. My bad.
 }
	}
}

func exports(socket, certPath string) map[string]string {
	out := make(map[string]string)

	out["DOCKER_HOST"] = socket
	out["DOCKER_CERT_PATH"] = certPath

	if runtime.GOOS == "windows" && isUnixShellOnWindows() {
 // Surround Windows-style paths with single quotes in exported path otherwise
 // bash swallows the backslashes in export statements like:
 // export DOCKER_CERT_PATH=C:\Users\ahmet\.boot2docker\certs\boot2docker-vm
 out["DOCKER_CERT_PATH"] = fmt.Sprintf("'%s'", out["DOCKER_CERT_PATH"])
	}

	if certPath == "" {
 out["DOCKER_TLS_VERIFY"] = ""
	} else {
Expand Down