From 29eff410e76779519b4c6fedb7cc360247cfe58b Mon Sep 17 00:00:00 2001 From: DanB Date: Wed, 6 Aug 2014 01:47:23 +0200 Subject: [PATCH] Putting back package files --- pkg/debian/rules | 10 +++++----- pkg/pkg_cgrates_deb.sh | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/debian/rules b/pkg/debian/rules index 81a0b841b..0913dd9b7 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -4,8 +4,8 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 -#export GOPATH=$(CURDIR) -export GOPATH=/usr/local/goapps +export GOPATH=$(CURDIR) +#export GOPATH=/usr/local/goapps PKGDIR=debian/cgrates SRCDIR=/usr/local/src/cgrates/cgrates.git/cgrates @@ -15,15 +15,15 @@ SRCDIR=/usr/local/src/cgrates/cgrates.git/cgrates clean: dh_clean - #rm -rf $(GOPATH)/bin/* $(GOPATH)/pkg/* + rm -rf $(GOPATH)/bin/* $(GOPATH)/pkg/* #cd $(GOPATH)/src && find * -name '*.go' -exec dirname {} \; | xargs -n1 go clean rm -f $(GOPATH)/goinstall.log binary-arch: clean dh_prep dh_installdirs - #exec $(SRCDIR)/update_external_libs.sh - #cd $(SRCDIR) && go install + exec $(SRCDIR)/update_external_libs.sh + cd $(SRCDIR) && go install mkdir -p $(PKGDIR)/usr/bin cp $(GOPATH)/bin/cgr-* $(PKGDIR)/usr/bin/ mkdir -p $(PKGDIR)/etc/cgrates diff --git a/pkg/pkg_cgrates_deb.sh b/pkg/pkg_cgrates_deb.sh index 8a1c77551..ad3e141b1 100755 --- a/pkg/pkg_cgrates_deb.sh +++ b/pkg/pkg_cgrates_deb.sh @@ -5,10 +5,10 @@ rm -rf $WORK_DIR mkdir -p $WORK_DIR cp -r debian $WORK_DIR/debian cd $WORK_DIR -#git clone https://github.com/cgrates/cgrates.git src/github.com/cgrates/cgrates -#tar xvzf src/github.com/cgrates/cgrates/data/tutorials/fs_csv/freeswitch/etc/freeswitch_conf.tar.gz -#rm src/github.com/cgrates/cgrates/data/tutorials/fs_csv/freeswitch/etc/freeswitch_conf.tar.gz -#tar xvzf src/github.com/cgrates/cgrates/data/tutorials/fs_json/freeswitch/etc/freeswitch_conf.tar.gz -#rm src/github.com/cgrates/cgrates/data/tutorials/fs_json/freeswitch/etc/freeswitch_conf.tar.gz +git clone https://github.com/cgrates/cgrates.git src/github.com/cgrates/cgrates +tar xvzf src/github.com/cgrates/cgrates/data/tutorials/fs_csv/freeswitch/etc/freeswitch_conf.tar.gz +rm src/github.com/cgrates/cgrates/data/tutorials/fs_csv/freeswitch/etc/freeswitch_conf.tar.gz +tar xvzf src/github.com/cgrates/cgrates/data/tutorials/fs_json/freeswitch/etc/freeswitch_conf.tar.gz +rm src/github.com/cgrates/cgrates/data/tutorials/fs_json/freeswitch/etc/freeswitch_conf.tar.gz dpkg-buildpackage -us -uc -#rm -rf $WORK_DIR +rm -rf $WORK_DIR