diff --git a/scripts/PushToAPI.sh b/scripts/PushToAPI.sh index 0bfbd59..332c0aa 100644 --- a/scripts/PushToAPI.sh +++ b/scripts/PushToAPI.sh @@ -1,29 +1,27 @@ sha256() { sha256sum $1 | awk '{print $1}' } - prop() { grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//' } -project_id="luminol" mcversion_group=$(prop GroupMCV) mcversion=$(prop mcVersion) pre=$(prop preVersion) +pro_id_mcv=$project_id-$mcversion if [ $pre = "true" ]; then channel="experimental" else channel="default" fi + changes=$(git log -1 --pretty="[{\"commit\": \"%H\", \"message\": \"%s\", \"summary\": \"%s\"}]") -jar_sha256=`sha256 build/libs/luminol-1.20.4-paperclip.jar` -jar_name="luminol-1.20.4-paperclip.jar" +jar_sha256=`sha256 build/libs/$pro_id_mcv-paperclip.jar` +jar_name="$pro_id_mcv-paperclip.jar" ctime=$(date -u +"%s")"000" # v2 -echo "Authentication: $secret_v2" -#echo "{\"version_group\":\"$mcversion_group\",\"channel\":\"$channel\",\"changes\":\"$changes\",\"jar_name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"release_tag\":\"$tag\",\"time\":\"$ctime\"}" > data.json json=$(printf "{\\\"channel\\\":\\\"%s\\\", \\\"jar_name\\\":\\\"%s\\\", \\\"sha256\\\":\\\"%s\\\", \\\"tag\\\":\\\"%s\\\", \\\"time\\\":\\\"%s\\\", \\\"changes\\\":\\\"%s\\\"}" \ "$channel" "$jar_name" "$jar_sha256" "$tag" "$ctime" "$changes") echo "[DEBUG] $json" @@ -45,4 +43,4 @@ curl -L --request POST "https://api.luminolmc.com/v2/projects/$project_id/$mcver --data-urlencode "sha256=$jar_sha256" \ --data-urlencode "release_tag=$tag" \ --data-urlencode "time=$ctime" \ - --data-urlencode "changes=$changes" + --data-urlencode "changes=$changes" \ No newline at end of file diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh index bc46560..09d428c 100644 --- a/scripts/SetENV.sh +++ b/scripts/SetENV.sh @@ -1,19 +1,32 @@ 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" +project_id_b="Luminol" + commitid=$(git log --pretty='%h' -1) mcversion=$(prop mcVersion) +grdversion=$(prop version) preVersion=$(prop preVersion) release_tag="$mcversion-$commitid" -jarName="build/libs/luminol-1.20.4-paperclip.jar" +jarName="$project_id-$mcversion-paperclip.jar" +jarName_dir="build/libs/$jarName" make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true") number=$(git log --oneline master ^`git describe --tags --abbrev=0` | wc -l) -echo "commitid=$commitid" >> $GITHUB_ENV +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 +echo "commit_msg=$(git log --pretty='> [%h] %s' -$number)" >> $GITHUB_ENV +echo "$commit_msg" echo "mcversion=$mcversion" >> $GITHUB_ENV -echo "$mcversion" +echo "pre=$preVersion" >> $GITHUB_ENV echo "tag=$release_tag" >> $GITHUB_ENV echo "jar=$jarName" >> $GITHUB_ENV -echo "pre=$preVersion" >> $GITHUB_ENV -echo "make_latest=$make_latest" >> $GITHUB_ENV +echo "jar_dir=$jarName_dir" >> $GITHUB_ENV +echo "make_latest=$make_latest" >> $GITHUB_ENV \ No newline at end of file