Update dependencies and use Go modules

.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+packages/
+!cmd/*
+jj

Makefile

@@ -1,10 +1,14 @@
-all: 
+all:
 	@./build.sh
+
 clean:
 	@rm -f jj
+
 install: all
 	@cp jj /usr/local/bin
+
 uninstall: 
 	@rm -f /usr/local/bin/jj
+
 package:
-	@NOCOPY=1 ./build.sh package
+	@./build.sh package

build.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
+
+# usage:
+#   ./build.sh          # builds jj for the current system architecture
+#   ./build.sh package  # builds jj for windows/mac/linux/freebsd
+
 set -e
 
 VERSION="1.2.2"
-PROTECTED_MODE="no"
-
-export GO15VENDOREXPERIMENT=1
 
 cd $(dirname "${BASH_SOURCE[0]}")
-OD="$(pwd)"
-WD=$OD
 
 package(){
 	echo Packaging $1 Binary
@@ -40,28 +40,7 @@ if [ "$1" == "package" ]; then
 	exit
 fi
 
-# temp directory for storing isolated environment.
-TMP="$(mktemp -d -t sdb.XXXX)"
-function rmtemp {
-	rm -rf "$TMP"
-}
-trap rmtemp EXIT
-
-if [ "$NOCOPY" != "1" ]; then
-	# copy all files to an isloated directory.
-	WD="$TMP/src/github.com/tidwall/jj"
-	export GOPATH="$TMP"
-	for file in `find . -type f`; do
-		# TODO: use .gitignore to ignore, or possibly just use git to determine the file list.
-		if [[ "$file" != "." && "$file" != ./.git* && "$file" != ./jj ]]; then
-			mkdir -p "$WD/$(dirname "${file}")"
-			cp -P "$file" "$WD/$(dirname "${file}")"
-		fi
-	done
-	cd $WD
-fi
-
 
 # build and store objects into original directory.
-go build -ldflags "-X main.version=$VERSION" -o "$OD/jj" cmd/jj/*.go
+go build -ldflags "-X main.version=$VERSION" -o jj cmd/jj/*.go
 

go.mod

@@ -0,0 +1,10 @@
+module github.com/tidwall/jj
+
+go 1.13
+
+require (
+	github.com/mattn/go-isatty v0.0.10
+	github.com/tidwall/gjson v1.3.4
+	github.com/tidwall/pretty v1.0.0
+	github.com/tidwall/sjson v1.0.4
+)

go.sum

@@ -0,0 +1,12 @@
+github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/tidwall/gjson v1.3.4 h1:On5waDnyKKk3SWE4EthbjjirAWXp43xx5cKCUZY1eZw=
+github.com/tidwall/gjson v1.3.4/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
+github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
+github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
+github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/sjson v1.0.4 h1:UcdIRXff12Lpnu3OLtZvnc03g4vH2suXDXhBwBqmzYg=
+github.com/tidwall/sjson v1.0.4/go.mod h1:bURseu1nuBkFpIES5cz6zBtjmYeOQmEESshn7VpF15Y=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9YmqEm0diQn9QmZw/0mU=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=