update makefile

I2PAddr.go

@@ -21,6 +21,9 @@ var (
 	i2pB32enc *base32.Encoding = base32.NewEncoding("abcdefghijklmnopqrstuvwxyz234567")
 )
 
+// If you set this to true, Addr will return a base64 String()
+var StringIsBase64 bool
+
 // The public and private keys associated with an I2P destination. I2P hides the
 // details of exactly what this is, so treat them as blobs, but generally: One
 // pair of DSA keys, one pair of ElGamal keys, and sometimes (almost never) also
@@ -238,6 +241,9 @@ func (a I2PAddr) Base64() string {
 
 // Returns the I2P destination (base32-encoded)
 func (a I2PAddr) String() string {
+	if StringIsBase64 {
+		return a.Base64()
+	}
 	return string(a.Base32())
 }
 
@@ -261,7 +267,7 @@ func NewI2PAddrFromString(addr string) (I2PAddr, error) {
 	addr = strings.Trim(addr, "\t\n\r\f ")
 	// very basic check
 	if len(addr) > 4096 || len(addr) < 516 {
-		return I2PAddr(""), errors.New("Not an I2P address")
+		return I2PAddr(""), errors.New(addr + " is not an I2P address")
 	}
 	buf := make([]byte, i2pB64enc.DecodedLen(len(addr)))
 	if _, err := i2pB64enc.Decode(buf, []byte(addr)); err != nil {

Makefile

@@ -1,13 +1,31 @@
 
-build:
-	go build -a -tags netgo -ldflags '-w -extldflags "-static"'
+USER_GH=eyedeekay
+VERSION=0.33.7
+packagename=i2pkeys
 
 echo:
-	@echo "$(GOPATH)"
+	@echo "type make version to do release $(VERSION)"
+
+version:
+	github-release release -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(packagename) -t v$(VERSION) -d "version $(VERSION)"
+
+del:
+	github-release delete -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(packagename) -t v$(VERSION)
+
+tar:
+	tar --exclude .git \
+		--exclude .go \
+		--exclude bin \
+		-cJvf ../$(packagename)_$(VERSION).orig.tar.xz .
+
+copier:
+	echo '#! /usr/bin/env sh' > deb/copy.sh
+	echo 'for f in $$(ls); do scp $$f/*.deb user@192.168.99.106:~/DEBIAN_PKGS/$$f/main/; done' >> deb/copy.sh
 
 fmt:
 	find . -path ./.go -prune -o -name "*.go" -exec gofmt -w {} \;
 	find . -path ./.go -prune -o -name "*.i2pkeys" -exec rm {} \;
 
-install:
-	install -m755 i2pkeys /usr/local/bin/i2pkeys
+upload-linux:
+	github-release upload -R -u $(USER_GH) -r "$(packagename)" -t $(VERSION) -l `sha256sum ` -n "$(packagename)" -f "$(packagename)"
+