Merge remote-tracking branch 'origin/main' into multi-tenant
This commit is contained in:
@@ -77,7 +77,7 @@ func execTshark(html string, filename string, proto string, port int) {
|
||||
//if err1 != nil {
|
||||
// fmt.Println("write html failed")
|
||||
//}else {
|
||||
//xsltproc pdml2html.xsl ngap.pdml > /home/manager/ngap.html
|
||||
//xsltproc pdml2html.xsl ngap.pdml > /home/omcuser/ngap.html
|
||||
command := fmt.Sprintf("xsltproc /usr/local/omc/etc/schema/pdml2html.xsl %s > %s", pdmlFile, html)
|
||||
dest := exec.Command("sh", "-c", command)
|
||||
_, err2 := dest.Output()
|
||||
|
||||
@@ -17,7 +17,7 @@ BINNAME = data2html
|
||||
|
||||
.PHONY: build $(BINNAME)
|
||||
build $(BINNAME):
|
||||
go build -o $(BINNAME) -v -ldflags "-X '$(LIBDIR)/global.Version=$(VERSION)' \
|
||||
go build -o $(BINNAME) -v -ldflags "-s -w -X '$(LIBDIR)/global.Version=$(VERSION)' \
|
||||
-X '$(LIBDIR)/global.BuildTime=`date`' \
|
||||
-X '$(LIBDIR)/global.GoVer=`go version`'"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user