Skip to content

Commit 0ebe495

Browse files
jackblack369jackblack369
committed
[cmd] change curveadm binary name to dingoadm
1 parent b7727f8 commit 0ebe495

File tree

23 files changed

+63
-62
lines changed

23 files changed

+63
-62
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ GOBIN_GOLANGCILINT := $(shell which $(GOBIN)/golangci-lint)
2020
GO := go
2121

2222
# output
23-
OUTPUT := bin/curveadm
23+
OUTPUT := bin/dingoadm
2424

2525
# build flags
2626
LDFLAGS := -s -w
@@ -63,7 +63,7 @@ debug:
6363
$(GOENV) $(GO) build -o $(OUTPUT) $(DEBUG_FLAGS) $(PACKAGES)
6464

6565
install:
66-
cp bin/curveadm ~/.curveadm/bin
66+
cp bin/dingoadm ~/.curveadm/bin
6767

6868
test:
6969
$(GO_TEST) $(TEST_FLAGS) ./...

‎build/package/upload.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
g_version=$1
44
g_nos_cmd=${NOSCMD}
55
g_root=$(pwd)/.build
6-
g_curveadm=${g_root}/curveadm
6+
g_curveadm=${g_root}/dingoadm
77
g_curveadm_bin=${g_curveadm}/bin
88
rm -rf ${g_root}
99

1010
mkdir -p ${g_curveadm_bin}
11-
cp bin/curveadm ${g_curveadm_bin}
11+
cp bin/dingoadm ${g_curveadm_bin}
1212
[[ -f .CHANGELOG ]] && cp .CHANGELOG ${g_curveadm}/CHANGELOG
13-
(cd ${g_curveadm} && ./bin/curveadm -v && ls -ls bin/curveadm && [[ -f CHANGELOG ]] && cat CHANGELOG)
14-
(cd ${g_root} && tar -zcf curveadm-${g_version}.tar.gz curveadm)
13+
(cd ${g_curveadm} && ./bin/dingoadm -v && ls -ls bin/dingoadm && [[ -f CHANGELOG ]] && cat CHANGELOG)
14+
(cd ${g_root} && tar -zcf dingoadm-${g_version}.tar.gz dingoadm)
1515

16-
read -p "Do you want to upload curveadm-${g_version}.tar.gz to NOS? " input
16+
read -p "Do you want to upload dingoeadm-${g_version}.tar.gz to NOS? " input
1717
case $input in
1818
[Yy]* )
1919
if [ -z ${g_nos_cmd} ]; then
2020
echo "nos: command not found"
2121
exit 1
2222
fi
2323
${g_nos_cmd} -putfile \
24-
${g_root}/curveadm-${g_version}.tar.gz \
25-
curveadm \
26-
-key release/curveadm-${g_version}.tar.gz \
24+
${g_root}/dingoadm-${g_version}.tar.gz \
25+
dingoadm \
26+
-key release/dingoadm-${g_version}.tar.gz \
2727
-replace true
2828
;;
2929
[Nn]* )

‎cli/cli/cli.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ type CurveAdm struct {
7575
/*
7676
* $HOME/.curveadm
7777
* - curveadm.cfg
78-
* - /bin/curveadm
78+
* - /bin/dingoadm
7979
* - /data/curveadm.db
8080
* - /plugins/{shell,file,polarfs}
8181
* - /logs/2006-01-02_15-04-05.log

‎cli/command/clean.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import (
3838

3939
const (
4040
CLEAN_EXAMPLE = `Examples:
41-
$ curveadm clean # Clean everything for all services
42-
$ curveadm clean --only='log,data' # Clean log and data for all services
43-
$ curveadm clean --role=etcd --only=container # Clean container for etcd services`
41+
$ dingoadm clean # Clean everything for all services
42+
$ dingoadm clean --only='log,data' # Clean log and data for all services
43+
$ dingoadm clean --role=etcd --only=container # Clean container for etcd services`
4444
)
4545

4646
var (

‎cli/command/client/map.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ import (
4141

4242
const (
4343
MAP_EXAMPLE = `Examples:
44-
$ curveadm map user:/volume --host machine1 --create # Map volume which created by automatic
45-
$ curveadm map user:/volume --host machine1 --size=10GiB --create # Map volume which size is 10GiB and created by automatic
46-
$ curveadm map user:/volume --host machine1 --create --poolset ssd # Map volume created by automatic in poolset 'ssd'
47-
$ curveadm map user:/volume --host machine1 -c /path/to/client.yaml # Map volume with specified configure file`
44+
$ dingoadm map user:/volume --host machine1 --create # Map volume which created by automatic
45+
$ dingoadm map user:/volume --host machine1 --size=10GiB --create # Map volume which size is 10GiB and created by automatic
46+
$ dingoadm map user:/volume --host machine1 --create --poolset ssd # Map volume created by automatic in poolset 'ssd'
47+
$ dingoadm map user:/volume --host machine1 -c /path/to/client.yaml # Map volume with specified configure file`
4848
)
4949

5050
var (

‎cli/command/client/mount.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ import (
3939

4040
const (
4141
MOUNT_EXAMPLE = `Examples:
42-
$ curveadm mount /s3_001 /path/to/mount --host machine -c client.yaml [--fstype s3] # Mount a s3 CurveFS '/s3_001' to '/path/to/mount'
43-
$ curveadm mount /volume_001 /path/to/mount --host machine -c client.yaml --fstype volume # Mount a volume CurveFS '/volume_001' to '/path/to/mount'`
42+
$ dingoadm mount /s3_001 /path/to/mount --host machine -c client.yaml [--fstype s3] # Mount a s3 CurveFS '/s3_001' to '/path/to/mount'
43+
$ dingoadm mount /volume_001 /path/to/mount --host machine -c client.yaml --fstype volume # Mount a volume CurveFS '/volume_001' to '/path/to/mount'`
4444
)
4545

4646
var (

‎cli/command/client/unmap.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434

3535
const (
3636
UNMAP_EXAMPLE = `Examples:
37-
$ curveadm unmap user:volume --host machine1 # Unmap volume`
37+
$ dingoadm unmap user:volume --host machine1 # Unmap volume`
3838
)
3939

4040
var (

‎cli/command/cluster/add.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import (
3838

3939
const (
4040
ADD_EXAMPLE = `Examples:
41-
$ curveadm add my-cluster # Add a cluster named 'my-cluster'
42-
$ curveadm add my-cluster -m "deploy for test" # Add a cluster with description
43-
$ curveadm add my-cluster -f /path/to/topology.yaml # Add a cluster with specified topology`
41+
$ dingoadm add my-cluster # Add a cluster named 'my-cluster'
42+
$ dingoadm add my-cluster -m "deploy for test" # Add a cluster with description
43+
$ dingoadm add my-cluster -f /path/to/topology.yaml # Add a cluster with specified topology`
4444
)
4545

4646
var (

‎cli/command/cluster/export.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const (
4343

4444
var (
4545
exportExample = `Examples:
46-
$ curveadm cluster export my-cluster # Export cluster 'my-cluster'
47-
$ curveadm cluster export my-cluster -o /path/to/dbfile # Export cluster 'my-cluster' to specified file`
46+
$ dingoadm cluster export my-cluster # Export cluster 'my-cluster'
47+
$ dingoadm cluster export my-cluster -o /path/to/dbfile # Export cluster 'my-cluster' to specified file`
4848
)
4949

5050
type exportOptions struct {

‎cli/command/cluster/import.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ const (
3838

3939
var (
4040
importExample = `Examples:
41-
$ curveadm cluster import my-cluster # Import cluster 'my-cluster' with curveadm.db
42-
$ curveadm cluster import my-cluster -f /path/to/dbfile # Import cluster 'my-cluster' with specified database file`
41+
$ dingoadm cluster import my-cluster # Import cluster 'my-cluster' with curveadm.db
42+
$ dingoadm cluster import my-cluster -f /path/to/dbfile # Import cluster 'my-cluster' with specified database file`
4343
)
4444

4545
type importOptions struct {

0 commit comments

Comments
 (0)