diff --git a/as-package.sh b/as-package.sh index 7b3c3839c..58202a0d6 100755 --- a/as-package.sh +++ b/as-package.sh @@ -4,9 +4,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" CUR_VERSION="3.0.3" -# arthas's target dir -ARTHAS_TARGET_DIR=$DIR/target/arthas - # arthas's version DATE=$(date '+%Y%m%d%H%M%S') @@ -27,41 +24,18 @@ exit_on_err() exit ${1} } -# maven package the arthas + +packaging_bin_path="$(ls ${DIR}/packaging/target/arthas-*-bin.zip)" + +maven package the arthas mvn clean package -Dmaven.test.skip=true -f $DIR/pom.xml \ || exit_on_err 1 "package arthas failed." rm -r $DIR/core/src/main/resources/com/taobao/arthas/core/res/version -# reset the target dir -mkdir -p ${ARTHAS_TARGET_DIR} - -# copy jar to TARGET_DIR -cp $DIR/spy/target/arthas-spy.jar ${ARTHAS_TARGET_DIR}/arthas-spy.jar -cp $DIR/core/target/arthas-core-jar-with-dependencies.jar ${ARTHAS_TARGET_DIR}/arthas-core.jar -cp $DIR/agent/target/arthas-agent-jar-with-dependencies.jar ${ARTHAS_TARGET_DIR}/arthas-agent.jar -cp $DIR/client/target/arthas-client-jar-with-dependencies.jar ${ARTHAS_TARGET_DIR}/arthas-client.jar - -# copy shell to TARGET_DIR -cat $DIR/bin/install-local.sh|sed "s/ARTHAS_VERSION=0.0/ARTHAS_VERSION=${ARTHAS_VERSION}/g" > ${ARTHAS_TARGET_DIR}/install-local.sh -chmod +x ${ARTHAS_TARGET_DIR}/install-local.sh -cp $DIR/bin/as.sh ${ARTHAS_TARGET_DIR}/as.sh -cp $DIR/bin/as.bat ${ARTHAS_TARGET_DIR}/as.bat - -# zip the arthas -cd $DIR/target/ -zip -r arthas-${ARTHAS_VERSION}-bin.zip arthas/ -cd - # install to local mkdir -p ${NEWEST_ARTHAS_LIB_HOME} -cp $DIR/target/arthas/* ${NEWEST_ARTHAS_LIB_HOME}/ +unzip ${packaging_bin_path} -d ${NEWEST_ARTHAS_LIB_HOME}/ + -if [ $# -gt 0 ] && [ "$1" = "-release" ]; then - echo "creating git tag ${ARTHAS_VERSION}..." - git tag -a ${ARTHAS_VERSION} -m "release ${ARTHAS_VERSION}" - if [ $? -eq 0 ]; then - echo "A local git tag ${ARTHAS_VERSION} has been created, please use 'git tag -l' to verify it." - echo "To commit the tag to remote repo, please run 'git push --tags' manually. " - fi -fi