From 3e4e6ab0c94bc57031cff9bde0549d683b2899bd Mon Sep 17 00:00:00 2001 From: DanB Date: Sat, 19 Sep 2015 14:21:11 +0200 Subject: [PATCH] Fix debian package build, rename glide_up.sh into glide_enable.sh and adding glide_disable.sh --- glide_disable.sh | 14 ++++++++++++++ glide_up.sh => glide_enable.sh | 6 ++++-- packages/debian/rules | 6 ++++-- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100755 glide_disable.sh rename glide_up.sh => glide_enable.sh (98%) diff --git a/glide_disable.sh b/glide_disable.sh new file mode 100755 index 000000000..b7361797c --- /dev/null +++ b/glide_disable.sh @@ -0,0 +1,14 @@ +#! /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_up.sh b/glide_enable.sh similarity index 98% rename from glide_up.sh rename to glide_enable.sh index 32fed7d80..36dccf01d 100755 --- a/glide_up.sh +++ b/glide_enable.sh @@ -1,5 +1,8 @@ #! /usr/bin/env sh +echo "export GO15VENDOREXPERIMENT=1" +export GO15VENDOREXPERIMENT=1 + echo "Executing Glide..." go get -v github.com/Masterminds/glide @@ -9,5 +12,4 @@ gu=$? exit $gl || $gu -echo "export GO15VENDOREXPERIMENT=1" -export GO15VENDOREXPERIMENT=1 + diff --git a/packages/debian/rules b/packages/debian/rules index 8695d02e0..bf81b7540 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 @@ -21,8 +22,9 @@ clean: binary-arch: clean dh_prep dh_installdirs - exec $(CURDIR)/update_external_libs.sh - ln -sf $(CURDIR) src/github.com/cgrates/cgrates + mkdir -p src/github.com/cgrates + ln -sf $(CURDIR) src/github.com/cgrates + exec $(CURDIR)/glide_enable.sh exec $(CURDIR)/build.sh mkdir -p $(PKGDIR)/usr/bin cp $(GOPATH)/bin/cgr-* $(PKGDIR)/usr/bin/