From: Dave Cheney <dave@cheney.net>
Date: Thu, 3 Sep 2015 22:47:40 +0000 (+1000)
Subject: [release-branch.go1.5] build: Fix bootstrap.bash for official source tarballs
X-Git-Tag: go1.5.1~19
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c20b8e145a471f242fba18f30dc830dac71ce50e;p=gostls13.git

[release-branch.go1.5] build: Fix bootstrap.bash for official source tarballs

At the moment, bootstrap.bash assumes it is called from a git working
copy. Hence, it fails to complete when running in an unpacked official
source tarball where .git and .gitignore do not exist. This fix adds a
test for existence for .git and a -f switch for the removal of
.gitignore.

Fixes #12223

Change-Id: I7f305b83b38d5115504932bd38dadb7bdeb5d487
Reviewed-on: https://go-review.googlesource.com/13770
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Andrew Gerrand <adg@golang.org>
Reviewed-on: https://go-review.googlesource.com/14281
---

diff --git a/src/bootstrap.bash b/src/bootstrap.bash
index 60d6151ccd..1b5ba7c536 100755
--- a/src/bootstrap.bash
+++ b/src/bootstrap.bash
@@ -35,8 +35,10 @@ cp -R "$src" "$targ"
 cd "$targ"
 echo
 echo "#### Cleaning $targ"
-rm .gitignore
-git clean -f -d
+rm -f .gitignore
+if [ -e .git ]; then
+	git clean -f -d
+fi
 echo
 echo "#### Building $targ"
 echo