Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove tour command from ipfs #4123

Merged
merged 1 commit into from
Aug 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/assets.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:generate go-bindata -pkg=assets -prefix=$GOPATH/src/gx/ipfs/QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T init-doc $GOPATH/src/gx/ipfs/QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T/dir-index-html
//go:generate go-bindata -pkg=assets -prefix=$GOPATH/src/gx/ipfs/QmdZ4PvPHFQVLLEve7DgoKDcSY19wwpGBB1GKjjKi2rEL1 init-doc $GOPATH/src/gx/ipfs/QmdZ4PvPHFQVLLEve7DgoKDcSY19wwpGBB1GKjjKi2rEL1/dir-index-html
//go:generate gofmt -w bindata.go

package assets
Expand Down Expand Up @@ -34,7 +34,7 @@ func SeedInitDocs(nd *core.IpfsNode) (*cid.Cid, error) {
return addAssetList(nd, initDocPaths)
}

var initDirPath = filepath.Join(os.Getenv("GOPATH"), "gx", "ipfs", "QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T", "dir-index-html")
var initDirPath = filepath.Join(os.Getenv("GOPATH"), "gx", "ipfs", "QmdZ4PvPHFQVLLEve7DgoKDcSY19wwpGBB1GKjjKi2rEL1", "dir-index-html")
var initDirIndex = []string{
filepath.Join(initDirPath, "knownIcons.txt"),
filepath.Join(initDirPath, "dir-index.html"),
Expand Down
2 changes: 1 addition & 1 deletion assets/assets_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

// TestEmbeddedDocs makes sure we don't forget to regenerate after documentation change
func TestEmbeddedDocs(t *testing.T) {
testNFiles(initDocPaths, 6, t, "documents")
testNFiles(initDocPaths, 5, t, "documents")
}

func TestDirIndex(t *testing.T) {
Expand Down
70 changes: 35 additions & 35 deletions assets/bindata.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/init-doc/quick-start
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 0.1 - Quick Start

This is a set of short examples with minimal explanation. It is meant as
a "quick start". Soon, we'll write a longer tour :-)
a "quick start".


Add a file to ipfs:
Expand Down
34 changes: 0 additions & 34 deletions assets/init-doc/tour/0.0-intro

This file was deleted.

1 change: 0 additions & 1 deletion core/commands/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ var rootSubcommands = map[string]*cmds.Command{
"stats": StatsCmd,
"swarm": SwarmCmd,
"tar": TarCmd,
"tour": tourCmd,
"file": unixfs.UnixFSCmd,
"update": ExternalBinary(),
"version": VersionCmd,
Expand Down
202 changes: 0 additions & 202 deletions core/commands/tour.go

This file was deleted.

27 changes: 0 additions & 27 deletions core/commands/tour_test.go

This file was deleted.

3 changes: 0 additions & 3 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ a running daemon do not read the config file at runtime.
- [`ReproviderInterval`](#reproviderinterval)
- [`SupernodeRouting`](#supernoderouting)
- [`Swarm`](#swarm)
- [`Tour`](#tour)

## `Addresses`
Contains information about various listener addresses to be used by this node.
Expand Down Expand Up @@ -221,5 +220,3 @@ improvement, as well as a reduction in memory usage.
- `DisableNatPortMap`
Disable NAT discovery.

## `Tour`
Unused.
22 changes: 1 addition & 21 deletions misc/completion/ipfs-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -811,26 +811,6 @@ _ipfs_tar_cat()
fi
}

_ipfs_tour()
{
_ipfs_comp "list next restart --help"
}

_ipfs_tour_list()
{
_ipfs_help_only
}

_ipfs_tour_next()
{
_ipfs_help_only
}

_ipfs_tour_restart()
{
_ipfs_help_only
}

_ipfs_update()
{
if [[ ${word} == -* ]] ; then
Expand Down Expand Up @@ -964,7 +944,7 @@ _ipfs()
1)
local opts="add bitswap block bootstrap cat commands config daemon dag dht \
diag dns file files get id init log ls mount name object pin ping pubsub \
refs repo resolve stats swarm tar tour update version"
refs repo resolve stats swarm tar update version"
COMPREPLY=( $(compgen -W "${opts}" -- ${word}) );;
2)
local command="${COMP_WORDS[1]}"
Expand Down
1 change: 0 additions & 1 deletion repo/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ type Config struct {
Discovery Discovery // local node's discovery mechanisms
Ipns Ipns // Ipns settings
Bootstrap []string // local nodes's bootstrap peer addresses
Tour Tour // local node's tour position
Gateway Gateway // local node's gateway server options
SupernodeRouting SupernodeClientConfig // local node's routing servers (if SupernodeRouting enabled)
API API // local node's API settings
Expand Down
7 changes: 0 additions & 7 deletions repo/config/tour.go

This file was deleted.

5 changes: 1 addition & 4 deletions test/3nodetest/bootstrap/config
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,5 @@
"AutoUpdate": "minor"
},
"Bootstrap": [
],
"Tour": {
"Last": ""
}
]
}
3 changes: 0 additions & 3 deletions test/3nodetest/client/config
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
"IPFS": "/ipfs",
"IPNS": "/ipns"
},
"Tour": {
"Last": ""
},
"Version": {
"AutoUpdate": "minor",
"Check": "error",
Expand Down
Loading