merger

zhoupro · zhoupro · commit bf3556e742fc · 2019-06-14T10:05:32.000+08:00
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 #### ubuntu
  ```bash
  ./init.sh --with_vim_php --with_vim_c --with_vim_ycm --with_vim_lua --with_vim_go --with_java \
---with_lua --with_python --with_leetcode --with_man --with_dict
+--with_lua --with_python --with_leetcode --with_man --with_dict --with_bash
  ```
 #### mac and centos
 ./init.sh
diff --git a/helper/option.sh b/helper/option.sh
@@ -9,6 +9,7 @@ OPT_PYTHON=
 OPT_LEETCODE=
 OPT_MAN=
 OPT_DICT=
+OPT_BASH=
 
 for option
 do
@@ -24,5 +25,6 @@ do
 		--with_leetcode)                          OPT_LEETCODE=yes                   ;;
 		--with_man)                          OPT_MAN=yes                   ;;
 		--with_dict)                          OPT_DICT=yes                   ;;
+		--with_bash)                          OPT_BASH=yes                   ;;
     esac
 done
diff --git a/tools/dep/ubuntu_init.sh b/tools/dep/ubuntu_init.sh
@@ -1,17 +1,13 @@
 #!/bin/bash
 
 apt-get install -y gawk curl  zsh language-pack-zh-hans language-pack-zh-hans-base \
-    git unzip wget curl python-dev cscope  cmake gdb lsof \
-    python3-pip python-pip shellcheck libtool-bin gettext sudo \
-    automake m4 autoconf libtool build-essential cmake pkg-config lua5.2 wamerican \
-    autojump  nmap iproute2 net-tools sshfs \
-    npm
+    git unzip wget  python-dev  python3-pip python-pip lsof \
+    libtool-bin gettext sudo \
+    cmake automake m4 autoconf libtool build-essential  pkg-config lua5.2 wamerican \
+    autojump  nmap iproute2 net-tools sshfs
 
 apt-get remove -y neovim exuberant-ctags
 
-if ! which bash-language-server > /dev/null; then
-    npm i -g bash-language-server
-fi
 if [ "Y$OPT_MAN" == "Yyes" ];then
     [ -f  /etc/dpkg/dpkg.cfg.d/excludes ] && rm -rf /etc/dpkg/dpkg.cfg.d/excludes
     apt-get install -y \
@@ -31,7 +27,15 @@ fi
 
 if [ "Y$OPT_VIM_C" == "Yyes" ];then
     apt-get install -y \
-    valgrind clang-format
+    valgrind clang-format cscope gdb
+fi
+
+if [ "Y$OPT_BASH" == "Yyes" ];then
+    apt-get install -y \
+    npm shellcheck
+    if ! which bash-language-server > /dev/null; then
+        npm i -g bash-language-server
+    fi
 fi
 
 # install ripgrep
