qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-15 02:50:31 -07:00
Code Releases Activity

[release-branch.go1] cmd/dist, sudo.bash: don't mention sudo.bash if cov or prof is not present

Browse Source 
««« backport e757e2af45ec
cmd/dist, sudo.bash: don't mention sudo.bash if cov or prof is not present
        Fixes #3422.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5967057
»»»
This commit is contained in:
Shenghou Ma 2012-04-02 22:33:38 +08:00
parent 465aef6f86
commit c50da29f00
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmd/dist/build.c vendored
View File

@ -19,7 +19,7 @@ char *goos;
char *goroot = GOROOT_FINAL;
char *goroot_final = GOROOT_FINAL;
char *workdir;
char *tooldir;
char *tooldir;
char *gochar;
char *goversion;
char *slash; // / for unix, \ for windows
@ -1462,7 +1462,7 @@ void
cmdbanner(int argc, char **argv)
{
char *pathsep;
Buf b, b1, search;
Buf b, b1, search, path;
ARGBEGIN{
case 'v':
@ -1478,6 +1478,7 @@ cmdbanner(int argc, char **argv)
binit(&b);
binit(&b1);
binit(&search);
binit(&path);
xprintf("\n");
xprintf("---\n");
@ -1495,9 +1496,10 @@ cmdbanner(int argc, char **argv)
xprintf("*** You need to add %s to your PATH.\n", gobin);
if(streq(gohostos, "darwin")) {
xprintf("\n"
"On OS X the debuggers must be installed setgid procmod.\n"
"Read and run ./sudo.bash to install the debuggers.\n");
if(isfile(bpathf(&path, "%s/cov", tooldir)))
xprintf("\n"
"On OS X the debuggers must be installed setgid procmod.\n"
"Read and run ./sudo.bash to install the debuggers.\n");
}
if(!streq(goroot_final, goroot)) {
@ -1509,6 +1511,7 @@ cmdbanner(int argc, char **argv)
bfree(&b);
bfree(&b1);
bfree(&search);
bfree(&path);
}
// Version prints the Go version.

7
src/sudo.bash
View File

@ -12,12 +12,17 @@ Darwin)
exit 0
esac
eval $(go env)
if ! [ -x $GOTOOLDIR/cov -a -x $GOTOOLDIR/prof ]; then
echo "You don't need to run sudo.bash." >&2
exit 2
fi
if [[ ! -d /usr/local/bin ]]; then
echo 1>&2 'sudo.bash: problem with /usr/local/bin; cannot install tools.'
exit 2
fi
eval $(go env)
cd $(dirname $0)
for i in prof cov
do