From d6a03039dcfd943a6e0551cd3269854662d39af7 Mon Sep 17 00:00:00 2001 From: Kegsay Date: Tue, 21 Mar 2017 17:43:13 +0000 Subject: [PATCH] Prefix 'dendrite-' onto dendrite binaries (#47) This distinguishes them from tools like 'kafka-producer' which are not required to run a dendrite server. The prefix also groups together the dendrite binaries nicely on `ls` as well as making it nicer to tab-complete. --- .../dendrite/cmd/{clientapi => dendrite-clientapi}/main.go | 0 .../dendrite/cmd/{roomserver => dendrite-roomserver}/main.go | 0 .../dendrite/cmd/roomserver-integration-tests/main.go | 2 +- travis-test.sh | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename src/github.com/matrix-org/dendrite/cmd/{clientapi => dendrite-clientapi}/main.go (100%) rename src/github.com/matrix-org/dendrite/cmd/{roomserver => dendrite-roomserver}/main.go (100%) diff --git a/src/github.com/matrix-org/dendrite/cmd/clientapi/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-clientapi/main.go similarity index 100% rename from src/github.com/matrix-org/dendrite/cmd/clientapi/main.go rename to src/github.com/matrix-org/dendrite/cmd/dendrite-clientapi/main.go diff --git a/src/github.com/matrix-org/dendrite/cmd/roomserver/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-roomserver/main.go similarity index 100% rename from src/github.com/matrix-org/dendrite/cmd/roomserver/main.go rename to src/github.com/matrix-org/dendrite/cmd/dendrite-roomserver/main.go diff --git a/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go b/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go index b2bd3760..42d974e5 100644 --- a/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go @@ -203,7 +203,7 @@ func testRoomserver(input []string, wantOutput []string, checkQueries func(api.R panic(err) } - cmd := exec.Command(filepath.Join(filepath.Dir(os.Args[0]), "roomserver")) + cmd := exec.Command(filepath.Join(filepath.Dir(os.Args[0]), "dendrite-roomserver")) // Append the roomserver config to the existing environment. // We append to the environment rather than replacing so that any additional diff --git a/travis-test.sh b/travis-test.sh index bf19612c..96a92df9 100755 --- a/travis-test.sh +++ b/travis-test.sh @@ -3,7 +3,7 @@ set -eu # Check that the servers build -gb build github.com/matrix-org/dendrite/cmd/roomserver +gb build github.com/matrix-org/dendrite/cmd/dendrite-roomserver gb build github.com/matrix-org/dendrite/cmd/roomserver-integration-tests # Run the pre commit hooks