cleaner command separation // vendor updates

myENA · Oct 31, 2017 · 75f3a3c · 75f3a3c
1 parent 0e0c62a
commit 75f3a3c
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ ifeq ($(SUDO),true)
 	sudo = sudo
 endif
 
-.PHONY: build test release check clean docker docker_release
+.PHONY: build test release check clean distclean docker docker-release
 
 build:
 	@build/build.sh -i
@@ -24,9 +24,12 @@ check:
 clean:
 	@build/build.sh -d
 
+distclean:
+	@build/build.sh -dc
+
 docker:
 	$(sudo) docker build -t $(IMAGE_PATH):latest .
 
-docker_release:
+docker-release:
 	$(sudo) docker build -t $(IMAGE_PATH):latest .
 	$(sudo) docker tag $(IMAGE_PATH):latest $(IMAGE_PATH):$(RELEASE_VERSION)
diff --git a/build/build.sh b/build/build.sh
@@ -33,8 +33,11 @@ ensureGox() {
 	fi
 }
 
+## exit toggle
+should_exit=false
+
 ## read options
-while getopts ":uidr" opt; do
+while getopts ":uidcr" opt; do
 	case $opt in
 		u)
 			ensureGlide
@@ -50,7 +53,13 @@ while getopts ":uidr" opt; do
 			printf "Removing binary, glide.lock and vendor directory ... "
 			rm -rf "${BUILD_NAME}" glide.lock vendor
 			printf "done.\n"
-			exit 0
+			should_exit=true
+		;;
+		c)
+			printf "Cleaning dist directory ... "
+			rm -rf ./dist/
+			printf "done.\n"
+			should_exit=true
 		;;
 		r)
 			ensureGox
@@ -65,6 +74,11 @@ done
 ## remove options
 shift $((OPTIND-1))
 
+## exiting?
+if [ $should_exit == true ]; then
+	exit 0
+fi
+
 ## check release option
 if [ $RELEASE_BUILD -eq 1 ]; then
 	## clean dist directory

diff --git a/backup/backup.go → command/backup/backup.go b/backup/backup.go → command/backup/backup.go
diff --git a/backup/command.go → command/backup/command.go b/backup/command.go → command/backup/command.go
diff --git a/backup/util.go → command/backup/util.go b/backup/util.go → command/backup/util.go
diff --git a/dump/command.go → command/dump/command.go b/dump/command.go → command/dump/command.go
diff --git a/dump/dump.go → command/dump/dump.go b/dump/dump.go → command/dump/dump.go
diff --git a/dump/util.go → command/dump/util.go b/dump/util.go → command/dump/util.go
diff --git a/restore/command.go → command/restore/command.go b/restore/command.go → command/restore/command.go
diff --git a/restore/restore.go → command/restore/restore.go b/restore/restore.go → command/restore/restore.go
diff --git a/restore/util.go → command/restore/util.go b/restore/util.go → command/restore/util.go
diff --git a/commands.go b/commands.go
@@ -5,9 +5,9 @@ import (
 	"os"
 
 	"github.com/mitchellh/cli"
-	"github.com/myENA/consul-backinator/backup"
-	"github.com/myENA/consul-backinator/dump"
-	"github.com/myENA/consul-backinator/restore"
+	"github.com/myENA/consul-backinator/command/backup"
+	"github.com/myENA/consul-backinator/command/dump"
+	"github.com/myENA/consul-backinator/command/restore"
 )
 
 // package global logger

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,14 +1,14 @@
 package: github.com/myENA/consul-backinator
 import:
 - package: github.com/hashicorp/consul
-  version: v0.9.3
+  version: v1.0.0
   subpackages:
   - api
 - package: github.com/mitchellh/cli
 - package: github.com/hashicorp/go-cleanhttp
 - package: github.com/hashicorp/go-discover
 - package: github.com/aws/aws-sdk-go
-  version: v1.10.38
+  version: v1.12.19
   subpackages:
   - aws
   - aws/awserr