rename 'as.sh' to 'as3.sh', 'arthas-boot.jar' to 'arthas-boot3.jar'

Author: siuhui

.github/ISSUE_TEMPLATE/bug-report--cn-.md

@@ -8,7 +8,7 @@ about: 提交Arthas Bug/使用疑问，使用这个模板
 
 ### 环境信息
 
-* `arthas-boot.jar` 或者 `as.sh` 的版本： xxx
+* `arthas-boot3.jar` 或者 `as3.sh` 的版本： xxx
 * Arthas 版本: xxx
 * 操作系统版本: xxx
 * 目标进程的JVM版本: xxx

CONTRIBUTING.md

@@ -32,23 +32,23 @@ Recommend to use [`as-package.sh`](as-package.sh) to package, which will auto-in
 * windows need to install gcc
 
 F.Y.I
-1. when using [`as.sh`](https://github.com/alibaba/arthas/blob/master/bin/as.sh) to start Arthas, it will get the latest version under `~/.arthas/lib`;
+1. when using [`as3.sh`](https://github.com/alibaba/arthas/blob/master/bin/as3.sh) to start Arthas, it will get the latest version under `~/.arthas/lib`;
 2. when [`as-package.sh`](as-package.sh) packaging, it will get the version from `pom.xml` and suffix it with the current timestamp e.g. `3.0.5.20180917161808`. 
 
-You can also use `./mvnw clean package -DskipTests` to package and generate a `zip` under `packaging/target/` but remember when `as.sh` starts, it load the version under `~/.arthas/lib`.
+You can also use `./mvnw clean package -DskipTests` to package and generate a `zip` under `packaging/target/` but remember when `as3.sh` starts, it load the version under `~/.arthas/lib`.
 
 ### Start Arthas in specified version
 
 When there are several different version, you can use `--use-version` to specify the version of Arthas to start your debug.
 
 ```bash
-./as.sh --use-version 3.0.5.20180919185025
+./as3.sh --use-version 3.0.5.20180919185025
 ```
 
 Tip: you can use `--versions` to list all available versions.
 
 ```bash
-./as.sh --versions
+./as3.sh --versions
 ```
 
 ### Debug
@@ -97,22 +97,22 @@ Tip: you can use `--versions` to list all available versions.
 * windows需要安装gcc
 
 
-`as.sh`在启动时，会对`~/.arthas/lib`下面的目录排序，取最新的版本。`as-package.sh`在打包时，会取`pom.xml`里的版本号，再拼接上当前时间，比如： `3.0.5.20180917161808`，这样子排序时取的就是最新的版本。
+`as3.sh`在启动时，会对`~/.arthas/lib`下面的目录排序，取最新的版本。`as-package.sh`在打包时，会取`pom.xml`里的版本号，再拼接上当前时间，比如： `3.0.5.20180917161808`，这样子排序时取的就是最新的版本。
 
-也可以直接 `./mvnw clean package -DskipTests`打包，生成的zip在 `packaging/target/` 下面。但是注意`as.sh`启动加载的是`~/.arthas/lib`下面的版本。
+也可以直接 `./mvnw clean package -DskipTests`打包，生成的zip在 `packaging/target/` 下面。但是注意`as3.sh`启动加载的是`~/.arthas/lib`下面的版本。
 
 ### 启动指定版本的arthas
 
 本地开发时，可能会产生多个版本，可以用 `--use-version` 参数来指定版本，比如
 
 ```bash
-./as.sh --use-version 3.0.5.20180919185025
+./as3.sh --use-version 3.0.5.20180919185025
 ```
 
 可以用`--versions`参数来列出所有版本：
 
 ```bash
-./as.sh --versions
+./as3.sh --versions
 ```
 
 ### Debug
@@ -133,7 +133,7 @@ Tip: you can use `--versions` to list all available versions.
 发布release版本流程：
 
 * 如果 arthas-vmtool 有更新，则需要手动触发action，构建后会把新的动态库文件提交到 lib 目录。 https://github.com/alibaba/arthas/actions/workflows/build-vmtool.yaml
-* 修改`as.sh`里的版本，最后修改日期， `Bootstrap.java`里的版本，Dockerfile里的版本
+* 修改`as3.sh`里的版本，最后修改日期， `Bootstrap.java`里的版本，Dockerfile里的版本
 * 修改本地的maven settings.xml
 * mvn clean deploy -DskipTests -P full -P release
 
@@ -146,7 +146,7 @@ Tip: you can use `--versions` to list all available versions.
     版本号信息地址： https://maven.aliyun.com/repository/public/com/taobao/arthas/arthas-packaging/maven-metadata.xml
 
 * 打上tag，push tag到仓库上
-* 需要更新 gh-pages 分支下面的 arthas-boot.jar/math-game.jar/as.sh ，下载 doc.zip，解压覆盖掉文档的更新
+* 需要更新 gh-pages 分支下面的 arthas-boot3.jar/math-game.jar/as3.sh ，下载 doc.zip，解压覆盖掉文档的更新
 * 需要更新docker镜像，push新的tag：https://hub.docker.com/r/hengyunabc/arthas/tags?page=1&ordering=last_updated
 
     以 3.6.5 版本为例：

README.md

@@ -50,32 +50,32 @@ Arthas was built to solve these issues. A developer can troubleshoot your produc
 
 ### Quick start
 
-#### Use `arthas-boot`(Recommended)
+#### Use `arthas-boot3`(Recommended)
 
-Download`arthas-boot.jar`，Start with `java` command:
+Download`arthas-boot3.jar`，Start with `java` command:
 
 ```bash
-curl -O https://arthas.aliyun.com/arthas-boot.jar
-java -jar arthas-boot.jar
+curl -O https://arthas.aliyun.com/arthas-boot3.jar
+java -jar arthas-boot3.jar
 ```
 
 Print usage:
 
 ```bash
-java -jar arthas-boot.jar -h
+java -jar arthas-boot3.jar -h
 ```
 
-#### Use `as.sh`
+#### Use `as3.sh`
 
 You can install Arthas with one single line command on Linux, Unix, and Mac. Copy the following command and paste it into the command line, then press *Enter* to run:
 
 ```bash
-curl -L https://arthas.aliyun.com/install.sh | sh
+curl -L https://arthas.aliyun.com/install3.sh | sh
 ```
 
-The command above will download the bootstrap script `as.sh` to the current directory. You can move it any other place you want, or put its location in `$PATH`.
+The command above will download the bootstrap script `as3.sh` to the current directory. You can move it any other place you want, or put its location in `$PATH`.
 
-You can enter its interactive interface by executing `as.sh`, or execute `as.sh -h` for more help information.
+You can enter its interactive interface by executing `as3.sh`, or execute `as3.sh -h` for more help information.
 
 
 ### Documentation

README_CN.md

@@ -36,36 +36,36 @@ English version goes [here](README.md).
 
 ### 快速开始
 
-#### 使用`arthas-boot`(推荐)
+#### 使用`arthas-boot3`(推荐)
 
-下载`arthas-boot.jar`，然后用`java -jar`的方式启动：
+下载`arthas-boot3.jar`，然后用`java -jar`的方式启动：
 
 ```bash
-curl -O https://arthas.aliyun.com/arthas-boot.jar
-java -jar arthas-boot.jar
+curl -O https://arthas.aliyun.com/arthas-boot3.jar
+java -jar arthas-boot3.jar
 ```
 
 打印帮助信息：
 
 ```bash
-java -jar arthas-boot.jar -h
+java -jar arthas-boot3.jar -h
 ```
 
-* 如果下载速度比较慢，可以使用aliyun的镜像：`java -jar arthas-boot.jar --repo-mirror aliyun --use-http`
+* 如果下载速度比较慢，可以使用aliyun的镜像：`java -jar arthas-boot3.jar --repo-mirror aliyun --use-http`
 
-#### 使用`as.sh`
+#### 使用`as3.sh`
 
 Arthas 支持在 Linux/Unix/Mac 等平台上一键安装，请复制以下内容，并粘贴到命令行中，敲 `回车` 执行即可：
 
 ```bash
-curl -L https://arthas.aliyun.com/install.sh | sh
+curl -L https://arthas.aliyun.com/install3.sh | sh
 ```
 
-上述命令会下载启动脚本文件 `as.sh` 到当前目录，你可以放在任何地方或将其加入到 `$PATH` 中。
+上述命令会下载启动脚本文件 `as3.sh` 到当前目录，你可以放在任何地方或将其加入到 `$PATH` 中。
 
-直接在shell下面执行`./as.sh`，就会进入交互界面。
+直接在shell下面执行`./as3.sh`，就会进入交互界面。
 
-也可以执行`./as.sh -h`来获取更多参数信息。
+也可以执行`./as3.sh -h`来获取更多参数信息。
 
 ### 文档
 

bin/as3.sh

@@ -188,23 +188,23 @@ esac
 
 # check curl/grep/awk/telnet/unzip command
 if ! [ -x "$(command -v curl)" ]; then
-  echo 'Error: curl is not installed. Try to use java -jar arthas-boot.jar' >&2
+  echo 'Error: curl is not installed. Try to use java -jar arthas-boot3.jar' >&2
   exit 1
 fi
 if ! [ -x "$(command -v grep)" ]; then
-  echo 'Error: grep is not installed. Try to use java -jar arthas-boot.jar' >&2
+  echo 'Error: grep is not installed. Try to use java -jar arthas-boot3.jar' >&2
   exit 1
 fi
 if ! [ -x "$(command -v awk)" ]; then
-  echo 'Error: awk is not installed. Try to use java -jar arthas-boot.jar' >&2
+  echo 'Error: awk is not installed. Try to use java -jar arthas-boot3.jar' >&2
   exit 1
 fi
 if ! [ -x "$(command -v telnet)" ]; then
-  echo 'Error: telnet is not installed. Try to use java -jar arthas-boot.jar' >&2
+  echo 'Error: telnet is not installed. Try to use java -jar arthas-boot3.jar' >&2
   exit 1
 fi
 if ! [ -x "$(command -v unzip)" ]; then
-  echo 'Error: unzip is not installed. Try to use java -jar arthas-boot.jar' >&2
+  echo 'Error: unzip is not installed. Try to use java -jar arthas-boot3.jar' >&2
   exit 1
 fi
 
@@ -466,20 +466,20 @@ Options and Arguments:
  <pid>                          Target pid
 
 EXAMPLES:
-  ./as.sh <pid>
-  ./as.sh --telnet-port 9999 --http-port -1
-  ./as.sh --username admin --password <password>
-  ./as.sh --tunnel-server 'ws://192.168.10.11:7777/ws' --app-name demoapp
-  ./as.sh --tunnel-server 'ws://192.168.10.11:7777/ws' --agent-id bvDOe8XbTM2pQWjF4cfw
-  ./as.sh --stat-url 'http://192.168.10.11:8080/api/stat'
-  ./as.sh -c 'sysprop; thread' <pid>
-  ./as.sh -f batch.as <pid>
-  ./as.sh --use-version 3.7.2
-  ./as.sh --session-timeout 3600
-  ./as.sh --attach-only
-  ./as.sh --disabled-commands stop,dump
-  ./as.sh --select math-game
-  ./as.sh --repo-mirror aliyun --use-http
+  ./as3.sh <pid>
+  ./as3.sh --telnet-port 9999 --http-port -1
+  ./as3.sh --username admin --password <password>
+  ./as3.sh --tunnel-server 'ws://192.168.10.11:7777/ws' --app-name demoapp
+  ./as3.sh --tunnel-server 'ws://192.168.10.11:7777/ws' --agent-id bvDOe8XbTM2pQWjF4cfw
+  ./as3.sh --stat-url 'http://192.168.10.11:8080/api/stat'
+  ./as3.sh -c 'sysprop; thread' <pid>
+  ./as3.sh -f batch.as <pid>
+  ./as3.sh --use-version 3.7.2
+  ./as3.sh --session-timeout 3600
+  ./as3.sh --attach-only
+  ./as3.sh --disabled-commands stop,dump
+  ./as3.sh --select math-game
+  ./as3.sh --repo-mirror aliyun --use-http
 WIKI:
   https://arthas.aliyun.com/doc
 
@@ -812,8 +812,8 @@ parse_arguments()
         fi
         if [[ ($httpPortPid) && ($TARGET_PID != $httpPortPid) ]]; then
             echo "Target process $TARGET_PID is not the process using port $(getHttpPortOrDefault), you will connect to an unexpected process."
-            echo "1. Try to restart as.sh, select process $httpPortPid, shutdown it first with running the 'stop' command."
-            echo "2. Try to use different http port, for example: as.sh --telnet-port 9998 --http-port 9999"
+            echo "1. Try to restart as3.sh, select process $httpPortPid, shutdown it first with running the 'stop' command."
+            echo "2. Try to use different http port, for example: as3.sh --telnet-port 9998 --http-port 9999"
             exit 1
         fi
     elif [ -z ${TARGET_PID} ]; then
@@ -931,8 +931,8 @@ sanity_check() {
     if [ "$current_user" != "$target_user" ]; then
         echo "The current user ($current_user) does not match with the owner of process ${TARGET_PID} ($target_user)."
         echo "To solve this, choose one of the following command:"
-        echo "  1) sudo su $target_user && ./as.sh"
-        echo "  2) sudo -u $target_user -EH ./as.sh"
+        echo "  1) sudo su $target_user && ./as3.sh"
+        echo "  2) sudo -u $target_user -EH ./as3.sh"
         exit_on_err 1
     fi
 }
@@ -972,15 +972,15 @@ port_pid_check() {
 
 print_telnet_port_pid_error() {
     echo "[ERROR] The telnet port $(getTelnetPortOrDefault) is used by process $telnetPortPid instead of target process $TARGET_PID, you will connect to an unexpected process."
-    echo "[ERROR] 1. Try to restart as.sh, select process $telnetPortPid, shutdown it first with running the 'stop' command."
+    echo "[ERROR] 1. Try to restart as3.sh, select process $telnetPortPid, shutdown it first with running the 'stop' command."
     echo "[ERROR] 2. Try to stop the existing arthas instance: java -jar arthas-client.jar 127.0.0.1 $(getTelnetPortOrDefault) -c \"stop\""
-    echo "[ERROR] 3. Try to use different telnet port, for example: as.sh --telnet-port 9998 --http-port -1"
+    echo "[ERROR] 3. Try to use different telnet port, for example: as3.sh --telnet-port 9998 --http-port -1"
 }
 
 print_telnet_port_used_error() {
     local error_msg=$1
     echo "[ERROR] The telnet port $(getTelnetPortOrDefault) is used, but process $error_msg, you will connect to an unexpected process."
-    echo "[ERROR] Try to use different telnet port, for example: as.sh --telnet-port 9998 --http-port -1"
+    echo "[ERROR] Try to use different telnet port, for example: as3.sh --telnet-port 9998 --http-port -1"
 }
 
 # active console

bin/install-local.sh renamed to bin/install-local3.sh

@@ -26,7 +26,7 @@ if [[ ! -x ${ARTHAS_LIB_HOME} ]]; then
     cp *.jar ${ARTHAS_LIB_HOME}/
 
     # make it -x
-    chmod +x ./as.sh
+    chmod +x ./as3.sh
 
 fi
 

bin/install.sh renamed to bin/install3.sh

@@ -1,16 +1,16 @@
 #! /bin/bash
 
-# temp file of as.sh
-TEMP_ARTHAS_FILE="./as.sh.$$"
+# temp file of as3.sh
+TEMP_ARTHAS_FILE="./as3.sh.$$"
 
-# target file of as.sh
-TARGET_ARTHAS_FILE="./as.sh"
+# target file of as3.sh
+TARGET_ARTHAS_FILE="./as3.sh"
 
 # update timeout(sec)
 SO_TIMEOUT=60
 
 # default downloading url
-ARTHAS_FILE_URL="https://arthas.aliyun.com/as.sh"
+ARTHAS_FILE_URL="https://arthas.aliyun.com/as3.sh"
 
 # exit shell with err_code
 # $1 : err_code
@@ -40,7 +40,7 @@ curl \
 || exit_on_err 1 "download failed!"
 
 # write or overwrite local file
-rm -rf as.sh
+rm -rf as3.sh
 mv ${TEMP_ARTHAS_FILE} ${TARGET_ARTHAS_FILE}
 chmod +x ${TARGET_ARTHAS_FILE}
 

boot/src/main/java/com/taobao/arthas/boot/Bootstrap.java

@@ -45,20 +45,20 @@
  */
 @Name("arthas-boot")
 @Summary("Bootstrap Arthas")
-@Description("EXAMPLES:\n" + "  java -jar arthas-boot.jar <pid>\n"
-                + "  java -jar arthas-boot.jar --telnet-port 9999 --http-port -1\n"
-                + "  java -jar arthas-boot.jar --username admin --password <password>\n"
-                + "  java -jar arthas-boot.jar --tunnel-server 'ws://192.168.10.11:7777/ws' --app-name demoapp\n"
-                + "  java -jar arthas-boot.jar --tunnel-server 'ws://192.168.10.11:7777/ws' --agent-id bvDOe8XbTM2pQWjF4cfw\n"
-                + "  java -jar arthas-boot.jar --stat-url 'http://192.168.10.11:8080/api/stat'\n"
-                + "  java -jar arthas-boot.jar -c 'sysprop; thread' <pid>\n"
-                + "  java -jar arthas-boot.jar -f batch.as <pid>\n"
-                + "  java -jar arthas-boot.jar --use-version 3.7.2\n"
-                + "  java -jar arthas-boot.jar --versions\n"
-                + "  java -jar arthas-boot.jar --select math-game\n"
-                + "  java -jar arthas-boot.jar --session-timeout 3600\n" + "  java -jar arthas-boot.jar --attach-only\n"
-                + "  java -jar arthas-boot.jar --disabled-commands stop,dump\n"
-                + "  java -jar arthas-boot.jar --repo-mirror aliyun --use-http\n" + "WIKI:\n"
+@Description("EXAMPLES:\n" + "  java -jar arthas-boot3.jar <pid>\n"
+                + "  java -jar arthas-boot3.jar --telnet-port 9999 --http-port -1\n"
+                + "  java -jar arthas-boot3.jar --username admin --password <password>\n"
+                + "  java -jar arthas-boot3.jar --tunnel-server 'ws://192.168.10.11:7777/ws' --app-name demoapp\n"
+                + "  java -jar arthas-boot3.jar --tunnel-server 'ws://192.168.10.11:7777/ws' --agent-id bvDOe8XbTM2pQWjF4cfw\n"
+                + "  java -jar arthas-boot3.jar --stat-url 'http://192.168.10.11:8080/api/stat'\n"
+                + "  java -jar arthas-boot3.jar -c 'sysprop; thread' <pid>\n"
+                + "  java -jar arthas-boot3.jar -f batch.as <pid>\n"
+                + "  java -jar arthas-boot3.jar --use-version 3.7.2\n"
+                + "  java -jar arthas-boot3.jar --versions\n"
+                + "  java -jar arthas-boot3.jar --select math-game\n"
+                + "  java -jar arthas-boot3.jar --session-timeout 3600\n" + "  java -jar arthas-boot3.jar --attach-only\n"
+                + "  java -jar arthas-boot3.jar --disabled-commands stop,dump\n"
+                + "  java -jar arthas-boot3.jar --repo-mirror aliyun --use-http\n" + "WIKI:\n"
                 + "  https://arthas.aliyun.com/doc\n")
 public class Bootstrap {
     private static final int DEFAULT_TELNET_PORT = 3658;
@@ -86,7 +86,7 @@ public class Bootstrap {
      * <pre>
      * The directory contains arthas-core.jar/arthas-client.jar/arthas-spy.jar.
      * 1. When use-version is not empty, try to find arthas home under ~/.arthas/lib
-     * 2. Try set the directory where arthas-boot.jar is located to arthas home
+     * 2. Try set the directory where arthas-boot3.jar is located to arthas home
      * 3. Try to download from remote repo
      * </pre>
      */
@@ -412,7 +412,7 @@ public static void main(String[] args) throws ParserConfigurationException, SAXE
                             pid, bootstrap.getHttpPortOrDefault());
             AnsiLog.error("1. Try to restart arthas-boot, select process {}, shutdown it first with running the 'stop' command.",
                             httpPortPid);
-            AnsiLog.error("2. Or try to use different http port, for example: java -jar arthas-boot.jar --telnet-port 9998 --http-port 9999");
+            AnsiLog.error("2. Or try to use different http port, for example: java -jar arthas-boot3.jar --telnet-port 9998 --http-port 9999");
             System.exit(1);
         }
 
@@ -440,7 +440,7 @@ public static void main(String[] args) throws ParserConfigurationException, SAXE
             arthasHomeDir = specialVersionDir;
         }
 
-        // Try set the directory where arthas-boot.jar is located to arthas home
+        // Try set the directory where arthas-boot3.jar is located to arthas home
         if (arthasHomeDir == null) {
             CodeSource codeSource = Bootstrap.class.getProtectionDomain().getCodeSource();
             if (codeSource != null) {
@@ -646,7 +646,7 @@ private static void checkTelnetPortPid(Bootstrap bootstrap, long telnetPortPid,
             AnsiLog.error("1. Try to restart arthas-boot, select process {}, shutdown it first with running the 'stop' command.",
                             telnetPortPid);
             AnsiLog.error("2. Or try to stop the existing arthas instance: java -jar arthas-client.jar 127.0.0.1 {} -c \"stop\"", bootstrap.getTelnetPortOrDefault());
-            AnsiLog.error("3. Or try to use different telnet port, for example: java -jar arthas-boot.jar --telnet-port 9998 --http-port -1");
+            AnsiLog.error("3. Or try to use different telnet port, for example: java -jar arthas-boot3.jar --telnet-port 9998 --http-port -1");
             System.exit(1);
         }
     }
@@ -677,7 +677,7 @@ private static long findProcessByTelnetClient(String arthasHomeDir, int telnetPo
             }
             if (error != null) {
                 AnsiLog.error("The telnet port {} is used, but process {}, you will connect to an unexpected process.", telnetPort, error);
-                AnsiLog.error("Try to use a different telnet port, for example: java -jar arthas-boot.jar --telnet-port 9998 --http-port -1");
+                AnsiLog.error("Try to use a different telnet port, for example: java -jar arthas-boot3.jar --telnet-port 9998 --http-port -1");
                 System.exit(1);
             }