Skip to content

Commit

Permalink
Merge pull request #7192 from ipfs/feat/update-dirindex
Browse files Browse the repository at this point in the history
feat: update dir index
  • Loading branch information
Stebalien authored Apr 21, 2020
2 parents 6269e9b + e09b65c commit 2cb8018
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 7 deletions.
40 changes: 39 additions & 1 deletion assets/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Assets loaded in with IPFS

## Generating docs
This directory contains the go-ipfs assets:

* Getting started documentation (`init-doc`).
* Directory listing HTML template (`dir-index-html` git submodule).

These assets are compiled into `bindata.go` with `go generate`.

## Re-generating

Do not edit the .go files directly.

Expand All @@ -10,3 +17,34 @@ assets directory:
```
go generate .
```

## Updating dir-index-html

Upstream: https://github.com/ipfs/dir-index-html

dir-index-html is a git submodule. To update, run the following commands from
this directory.

```bash
> git -C dir-index-html pull
> git -C dir-index-html checkout vX.Y.Z # target version
```

Then, you'll need to commit the updated submodule _before_ regenerating
`bindata.go`. Otherwise, `go generate` will checkout the checked-in version of
dir-index-html.

```bash
> git add dir-index-html
> git commit -m 'chore: update dir-index-html to vX.Y.Z'
```

Finally, re-generate the directory index HTML template and amend the previous
commit.

```bash
> go generate .
> git add bindata.go
> git commit --amend --no-edit

```
10 changes: 5 additions & 5 deletions assets/bindata.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/dir-index-html

0 comments on commit 2cb8018

Please sign in to comment.