From 3250c80efa036765955fa4068d419c852c0e29e8 Mon Sep 17 00:00:00 2001
From: ShintoKosei <2081384668@qq.com>
Date: Sun, 14 Apr 2024 11:07:26 +0800
Subject: [PATCH] update ci

---
 gradle.properties | 6 +++---
 scripts/SetENV.sh | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0dffdfc..0f0605d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,6 +8,6 @@ org.gradle.parallel = true
 org.gradle.vfs.watch = false
 org.gradle.jvmargs = -Xmx3G
 
-mcVersion=1.20.4
-GroupMCV=1.20
-preVersion=false
\ No newline at end of file
+mcVersion= 1.20.4
+GroupMCV= 1.20
+preVersion= false
\ No newline at end of file
diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh
index 9972bd0..f94e852 100644
--- a/scripts/SetENV.sh
+++ b/scripts/SetENV.sh
@@ -1,5 +1,5 @@
 prop() {
-  grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
+  grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//'
 }
 
 project_id="luminol"
@@ -14,12 +14,10 @@ jarName="$project_id-$mcversion-paperclip.jar"
 jarName_dir="build/libs/$jarName"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
 
-ls build/libs
-echo "build/libs/$project_id-paperclip-$grdversion-reobf.jar >> build/libs/$jarName"
-echo "build/libs/$project_id-bundler-$grdversion-reobf.jar >> build/libs/$project_id-$mcversion-bundler.jar"
 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
 
+
 echo "project_id=$project_id" >> $GITHUB_ENV
 echo "project_id_b=$project_id_b" >> $GITHUB_ENV
 echo "commit_id=$commitid" >> $GITHUB_ENV