From 0e3a0b64e7e2eb8976547f3ad0b3091c0d603e06 Mon Sep 17 00:00:00 2001
From: Alan Lapthorn <alan@lapthorn.org>
Date: Mon, 30 Jan 2017 23:13:14 +0000
Subject: [PATCH] Update READMEs

Fix typo

Fix typo in comment
---
 README.ja.md                                    | 10 +++++-----
 README.md                                       |  6 +++---
 models/models.go                                |  2 +-
 setup/docker/README.md                          |  2 +-
 setup/docker/go-cve-dictionary/latest/README.md |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.ja.md b/README.ja.md
index b9182a8f..289f86f4 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -1220,15 +1220,15 @@ see [go-cve-dictionary#usage-fetch-jvn-data](https://github.com/kotakanbe/go-cve
   **fetchnvd -> fetchjvnの順番で実行すること**  
 
 ```
-$ for i in {2002..2016}; do go-cve-dictionary fetchnvd -years $i; done
-$ for i in {1998..2016}; do go-cve-dictionary fetchjvn -years $i; done
+$ for i in `seq 2002 $(date +"%Y")`; do go-cve-dictionary fetchnvd -years $i; done
+$ for i in `seq 1998 $(date +"%Y")`; do go-cve-dictionary fetchjvn -years $i; done
 ```
 の順でやった場合、最初のコマンドが15分程度、二つ目のコマンドが10分程度（環境依存）
 
 
 ```
-$ for i in {1998..2016}; do go-cve-dictionary fetchjvn -years $i; done
-$ for i in {2002..2016}; do go-cve-dictionary fetchnvd -years $i; done
+$ for i in `seq 1998 $(date +"%Y")`; do go-cve-dictionary fetchjvn -years $i; done
+$ for i in `seq 2002 $(date +"%Y")`; do go-cve-dictionary fetchnvd -years $i; done
 ```
 の順で行うと、最初のコマンドは1時間くらいで終わるが二つ目のコマンドが21時間かかることもある(環境依存)。
 
@@ -1261,7 +1261,7 @@ $ git pull
 $ mv vendor /tmp/bar
 $ make install
 ```
-- バイナリファイルは`$GOPARH/bin`以下に作成される
+- バイナリファイルは`$GOPATH/bin`以下に作成される
 
 ---
 
diff --git a/README.md b/README.md
index 0fda20f7..985aa9c9 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,7 @@ $ git clone https://github.com/kotakanbe/go-cve-dictionary.git
 $ cd go-cve-dictionary
 $ make install
 ```
-The binary was built under `$GOPARH/bin`
+The binary was built under `$GOPATH/bin`
 
 Fetch vulnerability data from NVD.  
 It takes about 10 minutes (on AWS).  
@@ -192,7 +192,7 @@ $ git clone https://github.com/future-architect/vuls.git
 $ cd vuls
 $ make install
 ```
-The binary was built under `$GOPARH/bin`
+The binary was built under `$GOPATH/bin`
 
 ## Step6. Config
 
@@ -1224,7 +1224,7 @@ $ git pull
 $ mv vendor /tmp/bar
 $ make install
 ```
-Binary file was built under $GOPARH/bin
+Binary file was built under $GOPATH/bin
 
 ---
 
diff --git a/models/models.go b/models/models.go
index fc59d1e7..5d3ed55d 100644
--- a/models/models.go
+++ b/models/models.go
@@ -192,7 +192,7 @@ func (r ScanResult) ServerInfoTui() string {
 	)
 }
 
-// FormatServerName returns server and contianer name
+// FormatServerName returns server and container name
 func (r ScanResult) FormatServerName() string {
 	if len(r.Container.ContainerID) == 0 {
 		return r.ServerName
diff --git a/setup/docker/README.md b/setup/docker/README.md
index 56df6862..9d2a4328 100644
--- a/setup/docker/README.md
+++ b/setup/docker/README.md
@@ -92,7 +92,7 @@ vuls v0.1.xxx xxxx
 ## Step1. Fetch NVD
 
 ```console
-$ for i in {2002..2016}; do \
+$ for i in `seq 2002 $(date +"%Y")`; do \
     docker run --rm -it \
     -v $PWD:/vuls \
     -v $PWD/go-cve-dictionary-log:/var/log/vuls \
diff --git a/setup/docker/go-cve-dictionary/latest/README.md b/setup/docker/go-cve-dictionary/latest/README.md
index 588294ae..84f249e6 100644
--- a/setup/docker/go-cve-dictionary/latest/README.md
+++ b/setup/docker/go-cve-dictionary/latest/README.md
@@ -43,7 +43,7 @@ $ docker run --rm vuls/go-cve-dictionary -v
 ## fetchnvd
 
 ```console
-$ for i in {2002..2016}; do \
+$ for i in `seq 2002 $(date +"%Y")`; do \
     docker run --rm -it \
     -v $PWD:/vuls \
     -v $PWD/go-cve-dictionary-log:/var/log/vuls \