[incubator-shenyu] branch master updated: fix install.sh (#2959)

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new 45308a3  fix install.sh (#2959)
45308a3 is described below

commit 45308a3acef8e549e1767f56f301269d837ff0b4
Author: Sinsy <55...@qq.com>
AuthorDate: Tue Mar 1 22:14:54 2022 +0800

    fix install.sh (#2959)
---
 .../shenyu-docker-compose-dist/src/main/resources/install.sh     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/install.sh b/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/install.sh
index 47b12d4..8f0ebe0 100644
--- a/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/install.sh
+++ b/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/install.sh
@@ -39,7 +39,8 @@ fi
 
 if [ "$version" != "master" ];then
     # shellcheck disable=SC2016
-    sed -ir 's/latest/'"${version}"'/g' docker-compose.yaml
+    newVersion=${version#"v"}
+    sed -i 's/latest/'"${newVersion}"'/g' docker-compose.yaml
 fi
 
 if [ "$storage" = "mysql" ];then
@@ -49,11 +50,11 @@ if [ "$storage" = "mysql" ];then
 fi
 
 echo "download shenyu-admin of configuration"
-(cd shenyu-admin/conf/ && curl -OO https://raw.githubusercontent.com/apache/incubator-shenyu/${version}/shenyu-admin/src/main/resources/{application-mysql.yml,application.yml})
+(cd shenyu-admin/conf/ && curl -OOOO https://raw.githubusercontent.com/apache/incubator-shenyu/${version}/shenyu-admin/src/main/resources/{application-mysql.yml,application.yml,application-h2.yml,application-pg.yml})
 (cd shenyu-admin/conf/ && curl -O https://raw.githubusercontent.com/apache/incubator-shenyu/${version}/shenyu-dist/shenyu-admin-dist/src/main/resources/logback.xml)
 echo "download shenyu-bootstrap of configuration"
-(cd shenyu-bootstrap/conf/ && curl -OO https://raw.githubusercontent.com/apache/incubator-shenyu/${version}/shenyu-bootstrap/src/main/resources/{application-local.yml,application.yml})
+(cd shenyu-bootstrap/conf/ && curl -O https://raw.githubusercontent.com/apache/incubator-shenyu/${version}/shenyu-bootstrap/src/main/resources/application.yml)
 (cd shenyu-bootstrap/conf/ && curl -O https://raw.githubusercontent.com/apache/incubator-shenyu/${version}/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/logback.xml)
-(cd shenyu-bootstrap/agent/conf && curl -OO https://raw.githubusercontent.com/apache/incubator-shenyu/${version}/shenyu-dist/shenyu-agent-dist/src/main/resources/conf/{shenyu-agent.yaml,tracing-point.yaml})
+(cd shenyu-bootstrap/agent/conf && curl -OOOOOO https://raw.githubusercontent.com/apache/incubator-shenyu/${version}/shenyu-dist/shenyu-agent-dist/src/main/resources/conf/{shenyu-agent.yaml,tracing-point.yaml,logback.xml,logging-point.yaml,metrics-meta.yaml,metrics-point.yaml})
 
 docker-compose up -d
\ No newline at end of file