diff --git a/README.md b/README.md index be8737d0..90beef30 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ Please contact me at `bella#1111` on Discord, or email me at `bella.who.two@gmai [![Dl discord](https://img.shields.io/badge/downloads-47k-brightgreen?logo=discord&logoColor=white)](https://discord.gg/KfpqwZB) [![Dl Github](https://img.shields.io/github/downloads/kami-blue/client/total?label=downloads&logo=github)](https://github.com/kami-blue/client/releases) -[![Build Status features-master](https://img.shields.io/travis/com/kami-blue/client/feature/master?logo=gradle&label=build)](https://travis-ci.com/kami-blue/client) +[![Build Status features-master](https://img.shields.io/travis/com/kami-blue/client/master?logo=gradle&label=build)](https://travis-ci.com/kami-blue/client) [![Discord Mine](https://img.shields.io/discord/573954110454366214?label=chat&logo=discord&logoColor=white)](https://discord.gg/KfpqwZB) -[![Commits Mine](https://img.shields.io/github/commits-since/kami-blue/client/v1.0.1/feature/master?color=light-green&label=commits&logo=git&logoColor=white)](https://github.com/kami-blue/client/releases) +[![Commits Mine](https://img.shields.io/github/commits-since/kami-blue/client/v1.0.1/master?color=light-green&label=commits&logo=git&logoColor=white)](https://github.com/kami-blue/client/releases) [![Paypal](https://img.shields.io/badge/paypal-donate-red?color=169bd7&logo=paypal)](https://paypal.me/bellawhotwo) [![BTC](https://img.shields.io/badge/btc-clickme-red?color=f08b16&logo=bitcoin)](https://www.blockchain.com/btc/address/19pH4aNZZMPJkqQ2826BauRokyBs1NYon7) diff --git a/scripts/hook.sh b/scripts/hook.sh index 5a8283b4..0d1d8c60 100755 --- a/scripts/hook.sh +++ b/scripts/hook.sh @@ -5,14 +5,18 @@ if [[ "$TRAVIS_PULL_REQUEST" == "true" ]]; then exit 0; else echo "">/dev/null; COMMIT_TRIM="${TRAVIS_COMMIT::7}" COMMIT_MSG="$TRAVIS_COMMIT_MESSAGE" -if [[ "$BRANCH" == "feature/master" ]]; then +if [[ "$BRANCH" == "master" ]]; then # Send message with branch name curl -H "Content-Type: application/json" -X POST -d '{"embeds": [{"title": "","color": 10195199,"description": "**Changelog:** '"$COMMIT_MSG"'\nBranch: `'"$BRANCH"'`\nCommit: ['${COMMIT_TRIM}'](https://github.com/kami-blue/client/commits/'${COMMIT_TRIM}') Direct: ['${COMMIT_TRIM}'](https://github.com/kami-blue/client/commit/'${TRAVIS_COMMIT}') "}]}' "$WEBHOOK" # Upload the release file BUILD_DIR="$(readlink -f ./build/libs/)" JAR_DIR="$(ls "$BUILD_DIR" | grep "release")" - curl -F content=@"$BUILD_DIR/$JAR_DIR" "$WEBHOOK" + + mv JAR_DIR BUILD_DIR/kamiblue-1.12.2-${TRAVIS_COMMIT}.jar + JAR_DIR=BUILD_DIR/kamiblue-1.12.2-${TRAVIS_COMMIT}.jar + + curl -F content=@"$JAR_DIR" "$WEBHOOK" else exit 0 fi