Merge remote-tracking branch 'origin/master' into fix-update-list

getantibody · Jul 25, 2016 · b87ab7e · b87ab7e
2 parents ff23c68 + e891a0c
commit b87ab7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/git/git_protocols_test.go b/git/git_protocols_test.go
@@ -44,7 +44,7 @@ func TestClonesGitProtocol(t *testing.T) {
 func TestClonesSshProtocol(t *testing.T) {
 	home := internal.TempHome()
 	defer os.RemoveAll(home)
-	repo := git.NewGitRepo("ssh://github.com/caarlos0/jvm.git", home)
+	repo := git.NewGitRepo("ssh://git@github.com/caarlos0/jvm.git", home)
 	assert.NoError(t, repo.Download())
 	internal.AssertFileCount(t, 1, home)
 }

diff --git a/shell/init.go b/shell/init.go
@@ -12,7 +12,7 @@ antibody() {
 	case "$1" in
 	bundle|update)
 		while read -u 3 bundle; do
-			source "$bundle" 2&> /tmp/antibody-log
+			source "$bundle" 2&> /tmp/${USER}-antibody-log
 		done 3< <( $ANTIBODY_BINARY $@ )
 		;;
 	*)