From 7531d02334bfa5a356d4b6f28f5feefeec999ddf Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Sun, 9 Feb 2020 20:51:23 -0500 Subject: [PATCH] clean up Makefile --- Makefile | 7 +++++-- install.sh | 28 ---------------------------- 2 files changed, 5 insertions(+), 30 deletions(-) delete mode 100755 install.sh diff --git a/Makefile b/Makefile index 4aaf1fc7..3a2fa6ce 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ -.PHONY: all install release capdefs deps test +.PHONY: all install build release capdefs deps test capdef_file = ./irc/caps/defs.go all: install install: deps - ./install.sh + go install -v + +build: deps + go build -v release: deps goreleaser --skip-publish --rm-dist diff --git a/install.sh b/install.sh deleted file mode 100755 index 50dc9bd9..00000000 --- a/install.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -if [ -z "$GOPATH" ]; then - echo Error: \$GOPATH is unset - echo See https://golang.org/doc/code.html for details, or try these steps: - printf "\tmkdir -p ~/go\n" - printf "\texport GOPATH=~/go\n" - exit 1 -fi - -EXPECTED_DIR=${GOPATH}/src/github.com/oragono/oragono - -if [ "$PWD" != "$EXPECTED_DIR" ] ; then - echo Error: working directory is not where \$GOPATH expects it to be - echo "Expected: $EXPECTED_DIR" - echo "Actual: $PWD" - echo See https://golang.org/doc/code.html for details, or try these steps: - printf "\tmkdir -p %s/src/github.com/oragono\n" "$GOPATH" - printf "\tcd %s/src/github.com/oragono\n" "$GOPATH" - printf "\tmv %s oragono\n" "$PWD" - printf "\tcd oragono\n" - exit 1 -fi - -go install -v -echo successfully installed as "${GOPATH}/bin/oragono"