]> Cypherpunks repositories - gostls13.git/commitdiff
build: clean current tree in clean.bash
authorRuss Cox <rsc@golang.org>
Wed, 5 Aug 2015 17:39:07 +0000 (13:39 -0400)
committerRuss Cox <rsc@golang.org>
Wed, 5 Aug 2015 19:36:15 +0000 (19:36 +0000)
Otherwise clean.bash cleans $GOROOT, which might be something else entirely.

Fixes #12003.

Change-Id: I2ad5369017dde6db25f0c0514bc27c33d0a8bf54
Reviewed-on: https://go-review.googlesource.com/13251
Reviewed-by: David Crawshaw <crawshaw@golang.org>
src/clean.bash

index 8c23e010e8985475962bb01dffd51d0f559c2a73..39fe36d46df2713cad0632847f9552dc0d8474d6 100755 (executable)
@@ -5,13 +5,18 @@
 
 set -e
 
-eval $(go tool dist env)
+if [ ! -f run.bash ]; then
+       echo 'clean.bash must be run from $GOROOT/src' 1>&2
+       exit 1
+fi
+export GOROOT="$(cd .. && pwd)"
 
-if [ ! -x $GOTOOLDIR/dist ]; then
-       echo 'cannot find $GOTOOLDIR/dist; nothing to clean' >&2
+gobin="${GOBIN:-../bin}"
+if ! "$gobin"/go help >/dev/null 2>&1; then
+       echo 'cannot find go command; nothing to clean' >&2
        exit 1
 fi
 
-"$GOBIN/go" clean -i std
-"$GOBIN/go" tool dist clean
-"$GOBIN/go" clean -i cmd
+"$gobin/go" clean -i std
+"$gobin/go" tool dist clean
+"$gobin/go" clean -i cmd