Skip to content

Commit

Permalink
Merge branch 'release/0.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
GaelGirodon committed Feb 20, 2021
2 parents e223089 + 3a40021 commit 5523de7
Show file tree
Hide file tree
Showing 9 changed files with 1,041 additions and 518 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ web/*.min.*
# IDE
*.iml
.idea/

# Packr generated files
packrd/
*-packr.go
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

DirStat shows where your disk space has gone to help you to clean it up.
Copyright (C) 2018 Gaël Girodon
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

DirStat Copyright (C) 2018 Gaël Girodon
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ dirstat [--port 8000]

Install global dependencies:

- Node.js >= 12
- Node.js >= 14
- NPM >= 6
- Go >= 1.13
- [Packr](https://github.com/gobuffalo/packr) >= 1.30.0 (< 2.0.0)
- Go >= 1.15
- Packr >= 2
- PowerShell

Then, install project dependencies:

```shell
npm run ensure
npm install
```

### Build
Expand All @@ -57,7 +57,7 @@ npm run package

1. Start the release: `git flow release start X.Y.Z`
2. Update the version number in:
- [`package.json`](package.json) (+ `npm run ensure`)
- [`package.json`](package.json) (+ `npm install`)
- [`index.html`](web/index.html)
3. Commit changes: `git commit -m "Bump the version number"`
4. Finish the release: `git flow release finish X.Y.Z`
Expand Down
4 changes: 2 additions & 2 deletions dirstat.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"flag"
"fmt"
"github.com/gobuffalo/packr"
"github.com/gobuffalo/packr/v2"
"github.com/phayes/freeport"
"io/ioutil"
"log"
Expand Down Expand Up @@ -35,7 +35,7 @@ func main() {
url := fmt.Sprintf("http://%s", addr)

// Static file server
box := packr.NewBox("./web")
box := packr.New("web", "./web")
fs := http.FileServer(box)
http.Handle("/", fs)

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/gaelgirodon/dirstat

go 1.13
go 1.15

require (
github.com/gobuffalo/packr v1.30.1
github.com/gobuffalo/packr/v2 v2.8.1
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
)
149 changes: 125 additions & 24 deletions go.sum

Large diffs are not rendered by default.

Loading

0 comments on commit 5523de7

Please sign in to comment.