(SDI-2199) Fix intelsdi-x#1344 binary change to snaptel/snapteld

nanliu · Nov 17, 2016 · afe8245 · afe8245
1 parent 95ffc09
commit afe8245
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ plugins:
 all:
 	bash -c "./scripts/build_all.sh"
 install:
-	cp build/$(OS)/$(ARCH)/snapd /usr/local/bin/
-	cp build/$(OS)/$(ARCH)/snapctl /usr/local/bin/
+	cp build/$(OS)/$(ARCH)/snapteld /usr/local/sbin/
+	cp build/$(OS)/$(ARCH)/snaptel /usr/local/bin/
 proto:
 	cd `echo $(GOPATH) | cut -d: -f 1`; bash -c "./src/github.com/intelsdi-x/snap/scripts/gen-proto.sh"
diff --git a/cmd/snapctl/commands.go → cmd/snaptel/commands.go b/cmd/snapctl/commands.go → cmd/snaptel/commands.go
diff --git a/cmd/snapctl/config.go → cmd/snaptel/config.go b/cmd/snapctl/config.go → cmd/snaptel/config.go
diff --git a/cmd/snapctl/flags.go → cmd/snaptel/flags.go b/cmd/snapctl/flags.go → cmd/snaptel/flags.go
diff --git a/cmd/snapctl/main.go → cmd/snaptel/main.go b/cmd/snapctl/main.go → cmd/snaptel/main.go
@@ -58,7 +58,7 @@ func newUsageError(s string, ctx *cli.Context) usageError {
 
 func main() {
 	app := cli.NewApp()
-	app.Name = "snapctl"
+	app.Name = "snaptel"
 	app.Version = gitversion
 	app.Usage = "The open telemetry framework"
 	app.Flags = []cli.Flag{flURL, flSecure, flAPIVer, flPassword, flConfig}

diff --git a/cmd/snapctl/metric.go → cmd/snaptel/metric.go b/cmd/snapctl/metric.go → cmd/snaptel/metric.go
diff --git a/cmd/snapctl/plugin.go → cmd/snaptel/plugin.go b/cmd/snapctl/plugin.go → cmd/snaptel/plugin.go
diff --git a/cmd/snapctl/sample/psutil-file.json → cmd/snaptel/sample/psutil-file.json b/cmd/snapctl/sample/psutil-file.json → cmd/snaptel/sample/psutil-file.json
diff --git a/cmd/snapctl/sample/psutil-influx.json → cmd/snaptel/sample/psutil-influx.json b/cmd/snapctl/sample/psutil-influx.json → cmd/snaptel/sample/psutil-influx.json
diff --git a/cmd/snapctl/task.go → cmd/snaptel/task.go b/cmd/snapctl/task.go → cmd/snaptel/task.go
diff --git a/cmd/snapctl/tribe.go → cmd/snaptel/tribe.go b/cmd/snapctl/tribe.go → cmd/snaptel/tribe.go
diff --git a/scripts/build_snap.sh b/scripts/build_snap.sh
@@ -49,6 +49,6 @@ else
 fi
 
 mkdir -p "${build_path}"
-_info "building snapd/snapctl for ${GOOS}/${GOARCH}"
-"${go_build[@]}" -o "${build_path}/snapd" . || exit 1
-(cd "${__proj_dir}/cmd/snapctl" && "${go_build[@]}" -o "${build_path}/snapctl" . || exit 1)
+_info "building snapteld/snaptel for ${GOOS}/${GOARCH}"
+"${go_build[@]}" -o "${build_path}/snapteld" . || exit 1
+(cd "${__proj_dir}/cmd/snaptel" && "${go_build[@]}" -o "${build_path}/snaptel" . || exit 1)
diff --git a/snapd.go → snapteld.go b/snapd.go → snapteld.go
@@ -196,7 +196,7 @@ func main() {
 	}
 
 	cliApp = cli.NewApp()
-	cliApp.Name = "snapd"
+	cliApp.Name = "snapteld"
 	cliApp.Version = gitversion
 	cliApp.Usage = "The open telemetry framework"
 	cliApp.Flags = []cli.Flag{