Include signature in release bundle (ref #97)

2 files changed, 16 insertions, 7 deletions

diff --git a/README.md b/README.md
index 1cdd84410d..1a50b103e7 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,13 @@ making sure large swarms of selfish agents behave and somehow work
 towards a common goal. Here we have a much smaller swarm of cooperative
 agents and a simpler approach will suffice.
 
+Signed Releases
+---------------
+
+As of v0.7.0 and onwards, git tags and release binaries are GPG signed with
+the key BCE524C7 (http://nym.se/gpg.txt). The signature is included in the
+normal release bundle as `syncthing.asc` or `syncthing.exe.asc`.
+
 Documentation
 =============
 
diff --git a/build.sh b/build.sh
index 3f848642e9..a2b945d831 100755
--- a/build.sh
+++ b/build.sh
@@ -6,7 +6,7 @@ distFiles=(README.md LICENSE) # apart from the binary itself
 version=$(git describe --always)
 
 build() {
-	go build -ldflags "-w -X main.Version $version" ./cmd/syncthing	
+	go build -ldflags "-w -X main.Version $version" ./cmd/syncthing
 }
 
 prepare() {
@@ -16,24 +16,26 @@ prepare() {
 
 test() {
 	go test ./...
-}	
+}
 
 tarDist() {
 	name="$1"
+	rm -rf "$name"
 	mkdir -p "$name"
 	cp syncthing "${distFiles[@]}" "$name"
+	gpg -ab "$name/syncthing"
 	tar zcvf "$name.tar.gz" "$name"
 	rm -rf "$name"
-	gpg -ab "$name.tar.gz"
 }
 
 zipDist() {
 	name="$1"
+	rm -rf "$name"
 	mkdir -p "$name"
 	cp syncthing.exe "${distFiles[@]}" "$name"
+	gpg -ab "$name/syncthing.exe"
 	zip -r "$name.zip" "$name"
 	rm -rf "$name"
-	gpg -ab "$name.zip"
 }
 
 case "$1" in
@@ -42,7 +44,7 @@ case "$1" in
 		;;
 
 	tar)
-		rm -f *.tar.gz *.zip *.asc
+		rm -f *.tar.gz *.zip
 		prepare
 		test || exit 1
 		build
@@ -54,7 +56,7 @@ case "$1" in
 		;;
 
 	all)
-		rm -f *.tar.gz *.zip *.asc
+		rm -f *.tar.gz *.zip
 		prepare
 		test || exit 1
 
@@ -64,7 +66,7 @@ case "$1" in
 			export GOARCH=${os#*-}
 
 			build
-			
+
 			name="syncthing-$os-$version"
 			case $GOOS in
 				windows)