opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-21 11:44:16 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2990 from csasarak/janky_version

Browse Source 
Alias 'ipfs --version' to 'ipfs version'
This commit is contained in:
Jeromy Johnson
2016-08-04 06:58:15 -07:00
committed by GitHub
parent 813bcb641d 5e9cbd740d
commit 1eb94e64e3
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/ipfs/main.go
View File

@ -103,9 +103,13 @@ func main() {
} }
// Handle `ipfs help' // Handle `ipfs help'
if len(os.Args) == 2 && os.Args[1] == "help" { if len(os.Args) == 2 {
printHelp(false, os.Stdout) if os.Args[1] == "help" {
os.Exit(0) printHelp(false, os.Stdout)
os.Exit(0)
} else if os.Args[1] == "--version" {
os.Args[1] = "version"
}
} }
// parse the commandline into a command invocation // parse the commandline into a command invocation

13
test/sharness/t0010-basic-commands.sh
View File

@ -16,11 +16,24 @@ test_expect_success "ipfs version succeeds" '
ipfs version >version.txt ipfs version >version.txt
' '
test_expect_success "ipfs --version success" '
ipfs --version ||
test_fsh ipfs --version
'
test_expect_success "ipfs version output looks good" ' test_expect_success "ipfs version output looks good" '
egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" version.txt >/dev/null || egrep "^ipfs version [0-9]+\.[0-9]+\.[0-9]" version.txt >/dev/null ||
test_fsh cat version.txt test_fsh cat version.txt
' '
test_expect_success "ipfs versions matches ipfs --version" '
ipfs version > version.txt &&
ipfs --version > version2.txt &&
diff version2.txt version.txt ||
test_fsh ipfs --version
'
test_expect_success "ipfs version --all has all required fields" ' test_expect_success "ipfs version --all has all required fields" '
ipfs version --all > version_all.txt && ipfs version --all > version_all.txt &&
grep "go-ipfs version" version_all.txt && grep "go-ipfs version" version_all.txt &&