From bfe619272e44658539ba2be5b0d12f3c3986c23a Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Fri, 11 Mar 2016 18:45:28 -0500
Subject: [PATCH] Update make deps script to make it better for debian folks

Hopefully this should make it easier for debian users, or for users who
run the script in the wrong directory.
---
 misc/make-deps.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/misc/make-deps.sh b/misc/make-deps.sh
index 35ab62d9..c1550de8 100755
--- a/misc/make-deps.sh
+++ b/misc/make-deps.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 # setup a simple go environment
+XPWD=`pwd`
+ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"	# dir!
+cd "${ROOT}" >/dev/null
 
 travis=0
 if env | grep -q '^TRAVIS=true$'; then
@@ -19,8 +22,11 @@ if [ $travis -eq 0 ]; then
 
 	fi
 	if [ ! -z "$APT" ]; then
-		sudo $APT install -y golang golang-golang-x-tools mercurial
-
+		sudo $APT update
+		sudo $APT install -y golang make gcc packagekit mercurial
+		# one of these two golang tools packages should work on debian
+		sudo $APT install -y golang-golang-x-tools || true
+		sudo $APT install -y golang-go.tools || true
 	fi
 fi
 
@@ -42,3 +48,4 @@ go get ./...	# get all the go dependencies
 go get golang.org/x/tools/cmd/vet	# add in `go vet` for travis
 go get golang.org/x/tools/cmd/stringer	# for automatic stringer-ing
 go get github.com/golang/lint/golint	# for `golint`-ing
+cd "$XPWD" >/dev/null