correctly update version

This reverts commit ea16c11136.

.travis.yml

@@ -1,4 +1,26 @@
-script: make release-all
+script:
+- make release-all
 install: true
-go: 
-- 1.1
+before_install: 
+- export PYTHONPATH=/usr/local/lib/python2.7/site-packages
+- brew install bazaar
+- export CGO_CFLAGS="-mmacosx-version-min=10.4"
+- export CGO_LDFLAGS="-mmacosx-version-min=10.4"
+- wget https://go.googlecode.com/files/go1.2rc5.src.tar.gz
+- tar xzf go1.2rc5.src.tar.gz
+- pushd go/src
+- ./make.bash
+- popd
+- export GOPATH=./go
+- export PATH=$PATH:$GOPATH/bin
+after_success: 
+- sudo easy_install boto
+- NGROK="bin/ngrok" NGROKD="bin/ngrokd" VERSION=$(GOOS="" GOARCH="" GOPATH=$(pwd) go run build/version.go) python build/travis.py
+env: 
+  global: 
+  - secure: Fd5zHi58jx8lsPDv4tkRFzXSY0KnPJZuZ+LvnRcpX4+3xJsuZU6moOfrOcGqDOm7/SqZRVZRKZapE772+8sXNKPmwSXHRsZEsUgqxdehFzlVP4PQN5efOdI/quO2ibwVpZ6Idze5pelZburALd7/VbfHCTB/0P0WDMNvfHuFPQg=
+  - secure: Yg+y996B4S7zHXO8j6JrRbgMf6yilHGWv6I+7oZf02d8IHYtAb6A9DveX/q+v24O8Q9WzXRU4ZIaG5nJksVwb19qcy4vpaUbvx00COi8tg0l9hdKIotrzAs+i8q5h0xUifE1iuqYJw39vYU/9vC/727GTvOfRpBCr+edcpc9uy0=
+  - secure: CMF8ZfcoZK8AhFrmo6ljwP4ulYOSI9Pftp02rfNcM7LYPzU5HxFmcR7M4+3Qt0HAWxYrReozNQZYrV0s5jqIO0H4LZeHxgi7EHTam1BelhmHxL6VBMoR1mTi53bErWNhpoc0qyCnWMpnzNMObwtBVm9vjacm4NJMWqQjte/0Kdw=
+  matrix: 
+  - GOOS=darwin GOARCH=amd64
+language: objective-c

Makefile

@@ -13,7 +13,7 @@ fmt:
 	go fmt ngrok/...
 
 client: deps
-	go install -tags '$(BUILDTAGS)' ngrok/main/ngrok
+	go install -x -tags '$(BUILDTAGS)' ngrok/main/ngrok
 
 client-assets:
 	go get github.com/inconshreveable/go-bindata

build/travis.py

@@ -0,0 +1,19 @@
+#! /usr/bin/env python
+
+import os, os.path, boto.s3.connection
+
+access_key = os.getenv("AWS_ACCESS_KEY")
+secret_key = os.getenv("AWS_SECRET_KEY")
+bucket = os.getenv("BUCKET")
+version = os.getenv("VERSION")
+
+s3 = boto.s3.connection.S3Connection(access_key, secret_key)
+bucket = s3.get_bucket(bucket)
+
+for envpath in ["NGROK", "NGROKD"]:
+	file_path = os.getenv(envpath)
+	dir_path, name = os.path.split(file_path)
+	platform = "%s_%s" % (os.getenv("GOOS"), os.getenv("GOARCH"))
+	key_name = "%s/%s/%s" % (platform, version, name)
+	key = bucket.new_key(key_name)
+	key.set_contents_from_filename(file_path)

build/version.go

@@ -0,0 +1,10 @@
+package main
+
+import (
+	"fmt"
+	"ngrok/version"
+)
+
+func main() {
+	fmt.Print(version.MajorMinor())
+}