diff options
| author | fangshunjian <[email protected]> | 2022-12-14 14:21:06 +0800 |
|---|---|---|
| committer | fangshunjian <[email protected]> | 2022-12-14 14:21:06 +0800 |
| commit | c4b92da747c2b33cf19b704bbcb1ad4e45dce5b8 (patch) | |
| tree | 54ad0636a513df04b3cb9e2172a7cb21061863a6 | |
| parent | c7a3dc86f688a05f2f5e0045296a0660f7362009 (diff) | |
perf: NEZ-2463 编译rpm 包时打包jdk依赖rel-22.10.10
| -rw-r--r-- | tools/afterinstall.sh | 6 | ||||
| -rw-r--r-- | tools/package.sh | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/tools/afterinstall.sh b/tools/afterinstall.sh index 2b98ab2..75ca6ce 100644 --- a/tools/afterinstall.sh +++ b/tools/afterinstall.sh @@ -1,7 +1,11 @@ #!/bin/sh +WORK_DIR=/opt/nezha/nz-web + # Find Java -if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then +if [[ -x "$WORK_DIR/jdk/bin/java" ]]; then + JAVA_EXE="$WORK_DIR/jdk/bin/java" +elif [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then JAVA_EXE="$JAVA_HOME/bin/java" elif type -p java > /dev/null 2>&1; then JAVA_EXE=$(type -p java) diff --git a/tools/package.sh b/tools/package.sh index 12fedff..c5d8060 100644 --- a/tools/package.sh +++ b/tools/package.sh @@ -21,6 +21,8 @@ NZ_AGENT_PKG="release/nz-agent/nz-agent-22.10.01.4a0ca2ef-Release.x86_64.rpm" NZ_GUI_PKG="release/nz-gui/nz-gui-6d72a5f7.zip" NZ_TALON_PKG="release/nz-talon/nz-talon-22.10.01.bdede800-Release.x86_64.rpm" +# 依赖jdk 文件名 +JDK_FILENAME=jdk-8u202-linux-x64.tar.gz # 拉取依赖文件 mc cp nz/$NZ_WEB_PKG ./ mc cp nz/$NZ_AGENT_PKG ./ @@ -29,13 +31,18 @@ mc cp nz/$NZ_TALON_PKG ./ mc cp nz/depends/exporter/generator.zip ./ mc cp nz/depends/prometheus/promtool ./ mc cp nz/depends/map/Tiles.zip ./ +mc cp nz/depends/jdk/$JDK_FILENAME ./ # rpm 编译目录 BUILD_PATH=$CUR_PWD/build RPM_NZ_PATH=$BUILD_PATH/opt/nezha/nz-web +RPM_JDK_PATH=$RPM_NZ_PATH/jdk mkdir -p $BUILD_PATH $RPM_NZ_PATH $RPM_NZ_PATH/bin $RPM_NZ_PATH/install $RPM_NZ_PATH/config $RPM_NZ_PATH/generator $RPM_NZ_PATH/promtool $RPM_NZ_PATH/public $RPM_NZ_PATH/lib +mkdir -p $RPM_JDK_PATH echo 'packaging begin ...' +# 解压jdk +tar -xzf ./$JDK_FILENAME --strip-components 1 -C $RPM_JDK_PATH # 解压 nz-web.tar.gz tar -zxvf nz-web-*.tar.gz -C $RPM_NZ_PATH |