Skip to content

Commit

Permalink
Update README.md and 1.3.3 released
Browse files Browse the repository at this point in the history
  • Loading branch information
subchen committed Mar 19, 2018
1 parent b4d11ab commit 9ca46dc
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 8 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CWD := $(shell pwd)
NAME := frep
VERSION := 1.3.2
VERSION := 1.3.3

LDFLAGS := -s -w \
-X 'main.BuildVersion=$(VERSION)' \
Expand All @@ -17,6 +17,7 @@ clean:
@ rm -rf $(NAME) ./releases ./build

glide-vc:
@ glide update
@ glide-vc --only-code --no-tests --no-legal-files

fmt:
Expand Down
30 changes: 23 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ USAGE:
frep [options] input-file[:output-file] ...
VERSION:
1.3.2-x
1.3.3-x
AUTHORS:
Guoqiang Chen <subchen@gmail.com>
Expand All @@ -34,16 +34,17 @@ EXAMPLES:
frep nginx.conf.in:/etc/nginx.conf -e webroot=/usr/share/nginx/html -e port=8080
frep nginx.conf.in --json '{"webroot": "/usr/share/nginx/html", "port": 8080}'
frep nginx.conf.in --load config.json --overwrite
echo "{{ .Env.PATH }}" | frep -
```

## Downloads

v1.3.2 Release: https://github.com/subchen/frep/releases/tag/v1.3.2
v1.3.3 Release: https://github.com/subchen/frep/releases/tag/v1.3.3

- Linux

```
curl -fSL https://github.com/subchen/frep/releases/download/v1.3.2/frep-1.3.2-linux-amd64 -o /usr/local/bin/frep
curl -fSL https://github.com/subchen/frep/releases/download/v1.3.3/frep-1.3.3-linux-amd64 -o /usr/local/bin/frep
chmod +x /usr/local/bin/frep
```

Expand All @@ -56,15 +57,15 @@ v1.3.2 Release: https://github.com/subchen/frep/releases/tag/v1.3.2
- Windows

```
wget https://github.com/subchen/frep/releases/download/v1.3.2/frep-1.3.2-windows-amd64.exe
wget https://github.com/subchen/frep/releases/download/v1.3.3/frep-1.3.3-windows-amd64.exe
```

## Docker

You can run frep using docker container

```
docker run -it --rm subchen/frep:1.3.2 --help
docker run -it --rm subchen/frep:1.3.3 --help
```


Expand Down Expand Up @@ -138,7 +139,21 @@ docker run -it --rm subchen/frep:1.3.2 --help
frep nginx.conf.in --load config.toml
```

### Output
### Input/Output

- Input from file

```
// input file: nginx.conf
frep nginx.conf.in
```

- Input from console(stdin)

```
// input from stdin pipe
echo "{{ .Env.PATH }}" | frep -
```

- Output to default file (Removed last file ext)

Expand All @@ -154,10 +169,11 @@ docker run -it --rm subchen/frep:1.3.2 --help
frep nginx.conf.in:/etc/nginx.conf --overwrite -e port=8080
```

- Output to console
- Output to console(stdout)

```
frep nginx.conf.in --dryrun
frep nginx.conf.in:-
```

- Output multiple files
Expand Down

0 comments on commit 9ca46dc

Please sign in to comment.