From 9f01303c3f7414960893e013b7188b5537fe3fd0 Mon Sep 17 00:00:00 2001
From: LV <mamboer@live.com>
Date: Mon, 7 Aug 2017 16:16:57 +0800
Subject: [PATCH] chore: typo fix and update homebrew cask

---
 .gitignore                            |  3 +-
 package.json                          |  4 +--
 source/docs/dev-common/homebrew.md    | 44 +++++++++++++++++----------
 source/en/docs/dev-common/homebrew.md | 28 ++++++++++++-----
 4 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index e784e47..40938c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ node_modules/
 *.log
 db.json
 public/
-.deploy*/
\ No newline at end of file
+.deploy*/
+package-lock.json
\ No newline at end of file
diff --git a/package.json b/package.json
index e4b0b1c..9864644 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.3",
   "private": true,
   "hexo": {
-    "version": "3.2.2"
+    "version": "3.3.8"
   },
   "scripts": {
     "build": "hexo generate && gulp"
@@ -47,4 +47,4 @@
   "optionalDependencies": {
     "hexo-browsersync": "^0.2.0"
   }
-}
+}
\ No newline at end of file
diff --git a/source/docs/dev-common/homebrew.md b/source/docs/dev-common/homebrew.md
index 1a520c4..a36e481 100644
--- a/source/docs/dev-common/homebrew.md
+++ b/source/docs/dev-common/homebrew.md
@@ -97,28 +97,40 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/
 
 ### 安装HomeBrew Cask
 
-  HomeBrew Cask依赖于Xcode以及HomeBrew，建议在装这个之前装好前面两个软件，在`Terminal`执行下面命令进行安装：
+2015年12月后安装的`brew`自带`cask`。
 
-  ```bash
-  brew tap caskroom/cask && brew install brew-cask
-  ```
+如果你已在老版本的`brew`里面安装过`cask`，可以卸载掉它再更新`brew`：
+
+```bash
+brew update
+brew cleanup
+brew cask cleanup
+brew uninstall --force brew-cask
+brew update
+```
+
+对于老版本`brew`，但没有安装过`cask`，可以直接更新`brew`获得`cask`：
+
+```
+brew update
+```
 
 ### 使用HomeBrew Cask
 
-  搜索想要安装的软件，在`Terminal`输入下面命令即可：
+搜索想要安装的软件，在`Terminal`输入下面命令即可：
 
-  ```bash
-  brew cask search qq
-  ```
+```bash
+brew cask search qq
+```
 
-  一些推荐安装的程序，一键搞定：
+一些推荐安装的程序，一键搞定：
 
-  ```bash
-  rew cask install alfred cleanmymac cheatsheet dropbox google-chrome sublime-text
-  ```
+```bash
+brew cask install alfred cleanmymac cheatsheet dropbox google-chrome sublime-text
+```
 
-  如果你是一个热衷于`Alfred`的爱好者（不熟悉这个软件的下面会讲到），默认情况下`Alfred`是不会搜索到`HomeBrew Cask`安装的软件的，你需要额外执行下面命令关联起来才行：
+如果你是一个热衷于`Alfred`的爱好者（不熟悉这个软件的下面会讲到），默认情况下`Alfred`是不会搜索到`HomeBrew Cask`安装的软件的，你需要额外执行下面命令关联起来才行：
 
-  ```bash
-  brew cask alfred link
-  ```
+```bash
+brew cask alfred link
+```
diff --git a/source/en/docs/dev-common/homebrew.md b/source/en/docs/dev-common/homebrew.md
index 120b076..21ca331 100644
--- a/source/en/docs/dev-common/homebrew.md
+++ b/source/en/docs/dev-common/homebrew.md
@@ -77,21 +77,33 @@ The missing package manager for OS X.
   brew list
   ```
 
-## Install Homebrew extension Cask
+## HomeBrew Cask
+
+`brew` had integrated `cask` internally after 2015 year.
+
+If you had installed `cask` before 2015, you should uninstall it firstly and then upgrade `brew` to the latest version.
 
 ```bash
-brew install caskroom/cask/brew-cask
+brew update
+brew cleanup
+brew cask cleanup
+brew uninstall --force brew-cask
+brew update
 ```
 
-## Install common applications via Homebrew
+If you never installed `cask` before, you only need to upgrade `brew`.
 
-```bash
-brew install ack autojump automake colordiff curl git git-flow \
-             hub icoutils imagemagick libmemcached memcached openssl ossp-uuid qt \
-             readline redis tmux wget libxml2
+```
+brew update
+```
+
+### Search applications via Cask
+
+```
+brew cask search qq
 ```
 
-## Install applications via Homebrew Cask
+### Install applications via Cask
 
 ```bash
 brew cask install anvil