You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by sz...@apache.org on 2021/12/04 07:12:18 UTC
[ratis] branch master updated: RATIS-1460. Rename assembly id from ratis-shell to shell (#555)
This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 1453c4d RATIS-1460. Rename assembly id from ratis-shell to shell (#555)
1453c4d is described below
commit 1453c4dec30daddc2d86472a45faa659e01b9b20
Author: maobaolong <30...@qq.com>
AuthorDate: Sat Dec 4 15:12:11 2021 +0800
RATIS-1460. Rename assembly id from ratis-shell to shell (#555)
---
ratis-assembly/pom.xml | 2 +-
ratis-assembly/src/main/assembly/{ratis-shell.xml => shell-bin.xml} | 4 ++--
ratis-shell/src/main/libexec/ratis-shell-config.sh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ratis-assembly/pom.xml b/ratis-assembly/pom.xml
index ed7e56d..2bfb5c3 100644
--- a/ratis-assembly/pom.xml
+++ b/ratis-assembly/pom.xml
@@ -127,7 +127,7 @@
<descriptor>src/main/assembly/src.xml</descriptor>
<descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/examples-bin.xml</descriptor>
- <descriptor>src/main/assembly/ratis-shell.xml</descriptor>
+ <descriptor>src/main/assembly/shell-bin.xml</descriptor>
</descriptors>
</configuration>
</plugin>
diff --git a/ratis-assembly/src/main/assembly/ratis-shell.xml b/ratis-assembly/src/main/assembly/shell-bin.xml
similarity index 96%
rename from ratis-assembly/src/main/assembly/ratis-shell.xml
rename to ratis-assembly/src/main/assembly/shell-bin.xml
index bee666c..e586cec 100644
--- a/ratis-assembly/src/main/assembly/ratis-shell.xml
+++ b/ratis-assembly/src/main/assembly/shell-bin.xml
@@ -15,14 +15,14 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>ratis-shell</id>
+ <id>shell</id>
<formats>
<format>tar.gz</format>
</formats>
<fileSets>
<fileSet>
<directory>${project.basedir}/../ratis-shell/target/</directory>
- <outputDirectory>lib/ratis-shell</outputDirectory>
+ <outputDirectory>lib/shell</outputDirectory>
<fileMode>755</fileMode>
<includes>
<include>ratis-shell-*-jar-with-dependencies.jar</include>
diff --git a/ratis-shell/src/main/libexec/ratis-shell-config.sh b/ratis-shell/src/main/libexec/ratis-shell-config.sh
index 380c675..0fed399 100644
--- a/ratis-shell/src/main/libexec/ratis-shell-config.sh
+++ b/ratis-shell/src/main/libexec/ratis-shell-config.sh
@@ -29,7 +29,7 @@ this="${config_bin}/${script}"
# This will set the default installation for a tarball installation while os distributors can
# set system installation locations.
RATIS_SHELL_HOME=$(dirname $(dirname "${this}"))
-RATIS_SHELL_ASSEMBLY_CLIENT_JAR="${RATIS_SHELL_HOME}/lib/ratis-shell/*"
+RATIS_SHELL_ASSEMBLY_CLIENT_JAR="${RATIS_SHELL_HOME}/lib/shell/*"
RATIS_SHELL_CONF_DIR="${RATIS_SHELL_CONF_DIR:-${RATIS_SHELL_HOME}/conf}"
RATIS_SHELL_LOGS_DIR="${RATIS_SHELL_LOGS_DIR:-${RATIS_SHELL_HOME}/logs}"