From b8fcfd23218662c010bea44e1308fd2c4f8d785c Mon Sep 17 00:00:00 2001
From: ShintoKosei <2081384668@qq.com>
Date: Sun, 14 Apr 2024 12:11:05 +0800
Subject: [PATCH] fix ci

---
 scripts/PushToAPI.sh | 2 +-
 scripts/SetENV.sh    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh
index 332c0aa..2955314 100644
--- a/scripts/PushToAPI.sh
+++ b/scripts/PushToAPI.sh
@@ -2,7 +2,7 @@ sha256() {
   sha256sum $1 | awk '{print $1}'
 }
 prop() {
-  grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
+  grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//'
 }
 
 mcversion_group=$(prop GroupMCV)
diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh
index 83e7efc..79f30a7 100644
--- a/scripts/SetENV.sh
+++ b/scripts/SetENV.sh
@@ -13,7 +13,6 @@ release_tag="$mcversion-$commitid"
 jarName="$project_id-$mcversion-paperclip.jar"
 jarName_dir="build/libs/$jarName"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
-number=$(git log --oneline ver/1.20.4 ^`git describe --tags --abbrev=0` | wc -l)
 
 mv build/libs/$project_id-paperclip-$grdversion-reobf.jar build/libs/$jarName
 mv build/libs/$project_id-bundler-$grdversion-reobf.jar build/libs/$project_id-$mcversion-bundler.jar
@@ -22,7 +21,7 @@ mv build/libs/$project_id-bundler-$grdversion-reobf.jar build/libs/$project_id-$
 echo "project_id=$project_id" >> $GITHUB_ENV
 echo "project_id_b=$project_id_b" >> $GITHUB_ENV
 echo "commit_id=$commitid" >> $GITHUB_ENV
-echo "commit_msg=$(git log --pretty='> [%h] %s' -$number)" >> $GITHUB_ENV
+echo "commit_msg=$(git log --pretty='> [%h] %s' -1)" >> $GITHUB_ENV
 echo "$commit_msg"
 echo "mcversion=$mcversion" >> $GITHUB_ENV
 echo "pre=$preVersion" >> $GITHUB_ENV