diff --git a/glide_disable.sh b/glide_disable.sh deleted file mode 100755 index b7361797c..000000000 --- a/glide_disable.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /usr/bin/env sh - -echo "Disabling Glide..." - -echo "export GO15VENDOREXPERIMENT=0" -export GO15VENDOREXPERIMENT=0 - -echo "rm -rf vendor" -rm -rf vendor - -go get -v -u github.com/cgrates/cgrates/... -gg=$? - -exit $gg diff --git a/glide_enable.sh b/glide_enable.sh deleted file mode 100755 index 14f29f644..000000000 --- a/glide_enable.sh +++ /dev/null @@ -1,15 +0,0 @@ -#! /usr/bin/env sh - -echo "export GO15VENDOREXPERIMENT=1" -export GO15VENDOREXPERIMENT=1 - -echo "Executing Glide..." - -go get -v github.com/Masterminds/glide -gl=$? -$GOPATH/bin/glide up -gu=$? - -exit $gl || $gu - - diff --git a/packages/debian/rules b/packages/debian/rules index c4a302984..4487a1c95 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -5,6 +5,7 @@ export DH_VERBOSE=1 export GOPATH=$(CURDIR) +export GO15VENDOREXPERIMENT=1 PKGDIR=debian/cgrates SRCDIR=src/github.com/cgrates/cgrates @@ -23,7 +24,8 @@ binary-arch: clean dh_installdirs mkdir -p src/github.com/cgrates ln -sf $(CURDIR) src/github.com/cgrates - exec $(CURDIR)/glide_enable.sh + go get -v github.com/Masterminds/glide + $(GOPATH)/bin/glide up exec $(CURDIR)/build.sh mkdir -p $(PKGDIR)/usr/bin cp $(GOPATH)/bin/cgr-* $(PKGDIR)/usr/bin/