Merge branch 'master' into isissrv2

net/api/net.pb.go

@@ -5,9 +5,8 @@ package api
 
 import (
 	fmt "fmt"
-	math "math"
-
 	proto "github.com/golang/protobuf/proto"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

regenerate_proto.sh

 #!/bin/sh
-pushd $GOPATH/src
+dir=$(pwd)
+echo "Switching to GOPATH"
+cd "$GOPATH/src"
+echo "Generating protobuf code"
 protoc --go_out=plugins=grpc:. github.com/bio-routing/bio-rd/net/api/*.proto
 protoc --go_out=plugins=grpc:. github.com/bio-routing/bio-rd/route/api/*.proto
 protoc --go_out=plugins=grpc:. github.com/bio-routing/bio-rd/protocols/bgp/api/*.proto
-popd
+echo "Switching back to working directory"
+cd $dir