🐛 修复几个 bug

dunwu · dunwu · commit e5ea9cdf974d · 2018-02-02T16:56:16.000+08:00
diff --git a/codes/deploy/main.sh b/codes/deploy/main.sh
@@ -51,10 +51,9 @@ cat << EOF
 【2 - Common Tools】
     [2 | tools] install all tools.
     [git] install git                          [svn] install svn
-    [jdk8] install jdk8                        [jdk8] install jdk8
-    [maven] install maven                      [nginx] install nginx
-    [nodejs] install node.js                   [tomcat] install tomcat8
-    [elk] install elk
+    [jdk8] install jdk8                        [maven] install maven
+    [tomcat] install tomcat8                   [nginx] install nginx
+    [nodejs] install node.js                   [elk] install elk
 
 Press <CTRL-D> to exit
 Please input key：
@@ -72,7 +71,7 @@ function chooseOper() {
 
       2 | tools) ${filepath}/tool/install-all.sh;;
       git) ${filepath}/tool/git/install-git.sh;;
-      svn) ${filepath}/tool/git/install-svn.sh;;
+      svn) ${filepath}/tool/svn/install-svn.sh;;
       jdk8) ${filepath}/tool/jdk/install-jdk8.sh;;
       maven) ${filepath}/tool/maven/install-maven.sh;;
       nginx) ${filepath}/tool/nginx/install-nginx.sh;;
diff --git a/codes/deploy/tool/install-all.sh b/codes/deploy/tool/install-all.sh
@@ -2,9 +2,14 @@
 
 echo -e "\n>>>>>>>>> install all tools"
 
-./git/install-git.sh
-./jdk/install-jdk8.sh
-./maven/install-maven3.sh
-./nginx/install-nginx.sh
-./nodejs/install-nodejs.sh
-./tomcat/install-tomcat8.sh
+filepath=$(cd "$(dirname "$0")"; pwd)
+
+${filepath}/git/install-git.sh
+${filepath}/git/install-svn.sh
+${filepath}/jdk/install-jdk8.sh
+${filepath}/maven/install-maven.sh
+${filepath}/nginx/install-nginx.sh
+${filepath}/nodejs/install-nodejs.sh
+${filepath}/tomcat/install-tomcat8.sh
+${filepath}/elk/install-elk.sh
+
diff --git a/codes/deploy/tool/nodejs/install-nodejs.sh b/codes/deploy/tool/nodejs/install-nodejs.sh
@@ -3,7 +3,7 @@
 echo -e "\n>>>>>>>>> install Node.js"
 
 # 安装 nvm
-rm -rf /home/admin/.nvm
+rm -rf ~/.nvm
 git clone https://github.com/creationix/nvm.git ~/.nvm && cd ~/.nvm
 source ~/.nvm/nvm.sh
 
