From b6feca05a335852142b1fb41cafeb2a1ec4a05db Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Thu, 21 Feb 2019 03:29:39 -0500 Subject: [PATCH] first pass at #409 --- .travis.yml | 4 ---- Makefile | 10 +++++----- install.sh | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100755 install.sh diff --git a/.travis.yml b/.travis.yml index 972a1c6a..58a3b553 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,6 @@ language: go go: - "1.11.x" -install: make deps - script: -- wget https://github.com/goreleaser/goreleaser/releases/download/v0.62.2/goreleaser_Linux_x86_64.tar.gz -- tar -xzf goreleaser_Linux_x86_64.tar.gz -C $GOPATH/bin - make - make test diff --git a/Makefile b/Makefile index 864031f0..8b35ab9d 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ -.PHONY: all build +.PHONY: all install release capdefs deps test capdef_file = ./irc/caps/defs.go -all: build +all: install -build: - goreleaser --snapshot --rm-dist +install: deps + ./install.sh -buildrelease: +release: goreleaser --skip-publish --rm-dist capdefs: diff --git a/install.sh b/install.sh new file mode 100755 index 00000000..c3c7a6e5 --- /dev/null +++ b/install.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +if [ -z "$GOPATH" ]; then + echo \$GOPATH is unset: see https://golang.org/doc/code.html for details + exit 1 +fi + +EXPECTED_DIR=${GOPATH}/src/github.com/oragono/oragono + +if [ `pwd` != "$EXPECTED_DIR" ] ; then + echo working checkout is not where \$GOPATH expects it: should be $EXPECTED_DIR + exit 1 +fi + +go install -v +echo successfully installed as ${GOPATH}/bin/oragono