Merge branch 'release/0.8.0'

ssh-vault · Dec 20, 2016 · 4549e25 · 4549e25
2 parents 3c8fb06 + 5960428
commit 4549e25
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 
 GO ?= go
 BIN_NAME=ssh-vault
-GO_XC = ${GOPATH}/bin/goxc -os="freebsd netbsd openbsd darwin linux windows"
+GO_XC = ${GOPATH}/bin/goxc -os="freebsd netbsd openbsd darwin linux windows" -bc="!386"
 GOXC_FILE = .goxc.json
 GOXC_FILE_LOCAL = .goxc.local.json
 VERSION=$(shell git describe --tags --always)
@@ -13,13 +13,13 @@ get:
 	${GO} get
 
 build: get
-	${GO} get -u github.com/ssh-vault/ssh2pem
-	${GO} get -u golang.org/x/crypto/ssh/terminal
+	${GO} get -u github.com/keybase/go-keychain
+	${GO} get -u github.com/kr/pty
 	${GO} get -u github.com/ssh-vault/crypto
 	${GO} get -u github.com/ssh-vault/crypto/aead
 	${GO} get -u github.com/ssh-vault/crypto/oaep
-	${GO} get -u github.com/keybase/go-keychain
-	${GO} get -u github.com/kr/pty
+	${GO} get -u github.com/ssh-vault/ssh2pem
+	${GO} get -u golang.org/x/crypto/ssh/terminal
 	${GO} build -ldflags "-X main.version=${VERSION}" -o ${BIN_NAME} cmd/ssh-vault/main.go;
 
 clean:

diff --git a/get_password_darwin.go b/get_password_darwin.go
@@ -1,4 +1,5 @@
 // +build darwin
+// +build amd64
 
 // Apple's OpenSSH fork uses Keychain for private key passphrases.
 // They're indexed by the absolute file path to the private key,

diff --git a/get_password_darwin_test.go b/get_password_darwin_test.go
@@ -1,4 +1,5 @@
 // +build darwin
+// +build amd64
 
 package sshvault