From 71b124471eab98820fc832d432281b3b3625c2a3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 24 May 2013 22:26:51 -0400 Subject: [PATCH] change name to gopm --- build.go | 2 +- check.go | 4 ++-- doc/bitbucket.go | 2 +- doc/github.go | 2 +- doc/google.go | 2 +- doc/launchpad.go | 2 +- doc/walker.go | 2 +- docs/Quick_Start.md | 2 +- gopm.go | 16 ++++++++-------- i18n/en-US/usage.tpl | 8 ++++---- i18n/en-US/usage_build.txt | 2 +- i18n/en-US/usage_install.txt | 6 +++--- i18n/en-US/usage_remove.txt | 6 +++--- i18n/zh-CN/usage.tpl | 8 ++++---- i18n/zh-CN/usage_build.txt | 2 +- i18n/zh-CN/usage_install.txt | 6 +++--- i18n/zh-CN/usage_remove.txt | 6 +++--- install.go | 4 ++-- remove.go | 4 ++-- search.go | 2 +- 20 files changed, 44 insertions(+), 44 deletions(-) diff --git a/build.go b/build.go index ca2c4410e..249061617 100644 --- a/build.go +++ b/build.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "github.com/GPMGo/gpm/utils" + "github.com/GPMGo/gopm/utils" ) var cmdBuild = &Command{ diff --git a/check.go b/check.go index 74ceec2fb..a5d227bc0 100644 --- a/check.go +++ b/check.go @@ -9,8 +9,8 @@ import ( "os" "strings" - "github.com/GPMGo/gpm/doc" - "github.com/GPMGo/gpm/utils" + "github.com/GPMGo/gopm/doc" + "github.com/GPMGo/gopm/utils" ) var cmdCheck = &Command{ diff --git a/doc/bitbucket.go b/doc/bitbucket.go index b66b5a918..25b7f82c6 100644 --- a/doc/bitbucket.go +++ b/doc/bitbucket.go @@ -16,7 +16,7 @@ import ( "regexp" "strings" - "github.com/GPMGo/gpm/utils" + "github.com/GPMGo/gopm/utils" ) var ( diff --git a/doc/github.go b/doc/github.go index 79657d35a..481aa1b85 100644 --- a/doc/github.go +++ b/doc/github.go @@ -15,7 +15,7 @@ import ( "regexp" "strings" - "github.com/GPMGo/gpm/utils" + "github.com/GPMGo/gopm/utils" ) var ( diff --git a/doc/google.go b/doc/google.go index a0a19df07..557e73387 100644 --- a/doc/google.go +++ b/doc/google.go @@ -12,7 +12,7 @@ import ( "regexp" "strings" - "github.com/GPMGo/gpm/utils" + "github.com/GPMGo/gopm/utils" ) var ( diff --git a/doc/launchpad.go b/doc/launchpad.go index 04e36d5da..96ab019e4 100644 --- a/doc/launchpad.go +++ b/doc/launchpad.go @@ -15,7 +15,7 @@ import ( "regexp" "strings" - "github.com/GPMGo/gpm/utils" + "github.com/GPMGo/gopm/utils" ) var LaunchpadPattern = regexp.MustCompile(`^launchpad\.net/(?P(?P[a-z0-9A-Z_.\-]+)(?P/[a-z0-9A-Z_.\-]+)?|~[a-z0-9A-Z_.\-]+/(\+junk|[a-z0-9A-Z_.\-]+)/[a-z0-9A-Z_.\-]+)(?P/[a-z0-9A-Z_.\-/]+)*$`) diff --git a/doc/walker.go b/doc/walker.go index e225bba81..6c305dde8 100644 --- a/doc/walker.go +++ b/doc/walker.go @@ -20,7 +20,7 @@ import ( "runtime" "strings" - "github.com/GPMGo/gpm/utils" + "github.com/GPMGo/gopm/utils" ) type sliceWriter struct{ p *[]byte } diff --git a/docs/Quick_Start.md b/docs/Quick_Start.md index 84a04d7ad..17764d9ec 100644 --- a/docs/Quick_Start.md +++ b/docs/Quick_Start.md @@ -42,7 +42,7 @@ You can install gpm either from source or download binary. - Run test: switch work directory to gopm project, and execute command `go test` to build and test commands automatically(for now, tested commands are `gopm install`, `gopm remove`). - Add gopm project path to your environment variable `PATH` in order to execute it in other directories. -**Attention** You can actually put binary in any path that has already existed in $PATH, so you don't need to add a new path to $PATH again. +**Attention** If you install from source, you can actually put binary in any path that has already existed in $PATH, so you don't need to add a new path to $PATH again. ### Download binary diff --git a/gopm.go b/gopm.go index 9bbdbd3ab..13ee6e052 100644 --- a/gopm.go +++ b/gopm.go @@ -22,8 +22,8 @@ import ( "unicode/utf8" "github.com/BurntSushi/toml" - "github.com/GPMGo/gpm/doc" - "github.com/GPMGo/gpm/utils" + "github.com/GPMGo/gopm/doc" + "github.com/GPMGo/gopm/utils" ) var ( @@ -117,8 +117,8 @@ func getAppPath() bool { if !utils.IsExist(appPath + "conf/") { paths := utils.GetGOPATH() for _, p := range paths { - if utils.IsExist(p + "/src/github.com/GPMGo/gpm/") { - appPath = p + "/src/github.com/GPMGo/gpm/" + if utils.IsExist(p + "/src/github.com/GPMGo/gopm/") { + appPath = p + "/src/github.com/GPMGo/gopm/" break } } @@ -288,7 +288,7 @@ func initialize() bool { } // Load configuration. - if _, err := toml.DecodeFile(appPath+"conf/gpm.toml", &config); err != nil { + if _, err := toml.DecodeFile(appPath+"conf/gopm.toml", &config); err != nil { fmt.Printf("initialize -> Fail to load configuration[ %s ]\n", err) return false } @@ -361,7 +361,7 @@ func setExitStatus(n int) { } var usageTemplate string -var helpTemplate = `{{if .Runnable}}usage: gpm {{.UsageLine}} +var helpTemplate = `{{if .Runnable}}usage: gopm {{.UsageLine}} {{end}}{{.Long | trim}} ` @@ -401,7 +401,7 @@ func help(args []string) { return } if len(args) != 1 { - fmt.Fprintf(os.Stderr, "usage: gpm help command\n\nToo many arguments given.\n") + fmt.Fprintf(os.Stderr, "usage: gopm help command\n\nToo many arguments given.\n") os.Exit(2) // failed at 'gpm help' } @@ -415,7 +415,7 @@ func help(args []string) { } } - fmt.Fprintf(os.Stderr, "Unknown help topic %#q. Run 'gpm help'.\n", arg) + fmt.Fprintf(os.Stderr, "Unknown help topic %#q. Run 'gopm help'.\n", arg) os.Exit(2) // failed at 'go help cmd' } diff --git a/i18n/en-US/usage.tpl b/i18n/en-US/usage.tpl index ab38d90b7..e34116a55 100644 --- a/i18n/en-US/usage.tpl +++ b/i18n/en-US/usage.tpl @@ -1,18 +1,18 @@ -gpm(Go Package Manager) is a Go package manage tool for search, install, update, share packages. +gopm(Go Package Manager) is a Go package manage tool for search, install, update, share packages. Usage: - gpm command [arguments] + gopm command [arguments] The commands are: {{range .}}{{if .Runnable}} {{.Name | printf "%-11s"}} {{.Short}}{{end}}{{end}} -Use "gpm help [command]" for more information about a command. +Use "gopm help [command]" for more information about a command. Additional help topics: {{range .}}{{if not .Runnable}} {{.Name | printf "%-11s"}} {{.Short}}{{end}}{{end}} -Use "gpm help [topic]" for more information about that topic. +Use "gopm help [topic]" for more information about that topic. diff --git a/i18n/en-US/usage_build.txt b/i18n/en-US/usage_build.txt index a62b0ffc3..8d4b27526 100644 --- a/i18n/en-US/usage_build.txt +++ b/i18n/en-US/usage_build.txt @@ -16,4 +16,4 @@ The list flags accept a space-separated list of strings. For more about specifying packages, see 'go help packages'. -See also: gpm install. +See also: gopm install. diff --git a/i18n/en-US/usage_install.txt b/i18n/en-US/usage_install.txt index 368f6a9cc..fe68a7df3 100644 --- a/i18n/en-US/usage_install.txt +++ b/i18n/en-US/usage_install.txt @@ -21,7 +21,7 @@ The install flags are: The list flags accept a space-separated list of strings. For more about specifying packages, see 'go help packages'. -For more about bundle, see 'gpm help bundle'. -For more about snapshot, see 'gpm help snapshot'. +For more about bundle, see 'gopm help bundle'. +For more about snapshot, see 'gopm help snapshot'. -See also: gpm remove. +See also: gopm remove. diff --git a/i18n/en-US/usage_remove.txt b/i18n/en-US/usage_remove.txt index 9ecacd506..0ac596717 100644 --- a/i18n/en-US/usage_remove.txt +++ b/i18n/en-US/usage_remove.txt @@ -8,7 +8,7 @@ The remove flags are: The list flags accept a space-separated list of strings. For more about specifying packages, see 'go help packages'. -For more about bundle, see 'gpm help bundle'. -For more about snapshot, see 'gpm help snapshot'. +For more about bundle, see 'gopm help bundle'. +For more about snapshot, see 'gopm help snapshot'. -See also: gpm install. +See also: gopm install. diff --git a/i18n/zh-CN/usage.tpl b/i18n/zh-CN/usage.tpl index 0eaa59e12..e3a71cb94 100644 --- a/i18n/zh-CN/usage.tpl +++ b/i18n/zh-CN/usage.tpl @@ -1,18 +1,18 @@ -gpm（Go 包管理工具） 是一款涵盖搜索、安装、更新、分享功能 Go 包的管理工具。 +gopm（Go 包管理工具） 是一款涵盖搜索、安装、更新、分享功能 Go 包的管理工具。 用法: - gpm 命令 [参数] + gopm 命令 [参数] 命令列表: {{range .}}{{if .Runnable}} {{.Name | printf "%-11s"}} {{.Short}}{{end}}{{end}} -使用 "gpm help [命令]" 来获取相关命令的更多信息. +使用 "gopm help [命令]" 来获取相关命令的更多信息. 其它帮助主题: {{range .}}{{if not .Runnable}} {{.Name | printf "%-11s"}} {{.Short}}{{end}}{{end}} -使用 "gpm help [主题]" 来获取相关主题的更多信息. +使用 "gopm help [主题]" 来获取相关主题的更多信息. diff --git a/i18n/zh-CN/usage_build.txt b/i18n/zh-CN/usage_build.txt index 4a32d1071..475036805 100644 --- a/i18n/zh-CN/usage_build.txt +++ b/i18n/zh-CN/usage_build.txt @@ -15,5 +15,5 @@ Build 命令编译并安装 Go 包以及其依赖包. 获取更多有关包的信息，参见 'go help packages'. -相关主题: gpm install. +相关主题: gopm install. diff --git a/i18n/zh-CN/usage_install.txt b/i18n/zh-CN/usage_install.txt index ec1ad9374..f478d629b 100644 --- a/i18n/zh-CN/usage_install.txt +++ b/i18n/zh-CN/usage_install.txt @@ -19,7 +19,7 @@ Install 命令下载并安装 Go 包及其依赖包. 多个参数通过空格来间隔. 获取更多有关包的信息，参见 'go help packages'. -获取更多有关集合的信息，参见 'gpm help bundle'. -获取更多有关快照的信息，参见 'gpm help snapshot'. +获取更多有关集合的信息，参见 'gopm help bundle'. +获取更多有关快照的信息，参见 'gopm help snapshot'. -相关主题: gpm build. +相关主题: gopm build. diff --git a/i18n/zh-CN/usage_remove.txt b/i18n/zh-CN/usage_remove.txt index 08331b12d..9f9d530c1 100644 --- a/i18n/zh-CN/usage_remove.txt +++ b/i18n/zh-CN/usage_remove.txt @@ -8,7 +8,7 @@ Remove 命令删除 Go 包及其依赖包. 获取更多有关包的信息，参见 'go help packages'. -获取更多有关集合的信息，参见 'gpm help bundle'. -获取更多有关快照的信息，参见 'gpm help snapshot'. +获取更多有关集合的信息，参见 'gopm help bundle'. +获取更多有关快照的信息，参见 'gopm help snapshot'. -相关主题: gpm install. \ No newline at end of file +相关主题: gopm install. \ No newline at end of file diff --git a/install.go b/install.go index afa9c0228..891f33bc5 100644 --- a/install.go +++ b/install.go @@ -14,8 +14,8 @@ import ( "regexp" "strings" - "github.com/GPMGo/gpm/doc" - "github.com/GPMGo/gpm/utils" + "github.com/GPMGo/gopm/doc" + "github.com/GPMGo/gopm/utils" ) var ( diff --git a/remove.go b/remove.go index 9ae764196..fc5898ad2 100644 --- a/remove.go +++ b/remove.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - "github.com/GPMGo/gpm/doc" - "github.com/GPMGo/gpm/utils" + "github.com/GPMGo/gopm/doc" + "github.com/GPMGo/gopm/utils" ) var ( diff --git a/search.go b/search.go index 2199b0ace..2e7b099ec 100644 --- a/search.go +++ b/search.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/GPMGo/gpm/doc" + "github.com/GPMGo/gopm/doc" ) var cmdSearch = &Command{