diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13c59c9..3104ff9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -128,7 +128,7 @@ jobs: path: pojav - name: Repack JRE - run: bash "9_repackjre.sh" $GITHUB_WORKSPACE/pojav $GITHUB_WORKSPACE/pojav/jre${{ matrix.version }}-pojav + run: export TARGET_VERSION=${{ matrix.version }} && bash "9_repackjre.sh" $GITHUB_WORKSPACE/pojav $GITHUB_WORKSPACE/pojav/jre${{ matrix.version }}-pojav - name: Upload artifact uses: actions/upload-artifact@v4 diff --git a/9_repackjre.sh b/9_repackjre.sh index 44aa5bc..6f1b1ee 100755 --- a/9_repackjre.sh +++ b/9_repackjre.sh @@ -22,7 +22,7 @@ mkdir -p "$out" makearch () { echo "Making $2..."; cd "$work"; - tar xf $(find "$in" -name jre17-$2-*release.tar.xz) > /dev/null 2>&1; + tar xf $(find "$in" -name jre${TARGET_VERSION}-$2-*release.tar.xz) > /dev/null 2>&1; mv bin "$work1"/; mkdir -p "$work1"/lib; @@ -47,7 +47,7 @@ makearch () { makeuni () { echo "Making universal..."; cd "$work"; - tar xf $(find "$in" -name jre17-arm64-*release.tar.xz) > /dev/null 2>&1; + tar xf $(find "$in" -name jre${TARGET_VERSION}-arm64-*release.tar.xz) > /dev/null 2>&1; rm -rf bin; rm -rf lib/server;