fithwum/minecraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java detection fixes
minecraft-build-minecraft / Docker prune (vm-docker-build2) (push) Successful in 3s
Details
minecraft-build-minecraft / poll-debian-base-and-detect-changes (push) Successful in 18s
Details
minecraft-build-minecraft / Build and Push minecraft (push) Successful in 10s
Details
minecraft-build-minecraft / generate-changelogs (push) Successful in 8s
Details
minecraft-build-minecraft / generate-build-info (push) Successful in 10s
Details
minecraft-build-testing / Docker prune (vm-docker-build2) (push) Successful in 3s
Details
minecraft-build-testing / poll-debian-base-and-detect-changes (push) Successful in 21s
Details
minecraft-build-testing / Build and Push testing (push) Successful in 12s
Details
minecraft-build-testing / generate-changelogs (push) Successful in 8s
Details
minecraft-build-testing / generate-build-info (push) Successful in 8s
Details

Browse Source
This commit is contained in:
fithwum
2026-07-20 07:47:42 -07:00
parent dfeefba9b2
commit 1f9c8ba377
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minecraft/install_script.sh
+4 -4
View File
@@ -18,7 +18,7 @@ NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neof
# Install java # Install java
if [ $JAVA_VERSION = "openjdk-21-jre" ]; then if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s openjdk-21-jre-headless &> /dev/null if [ dpkg -s openjdk-21-jre-headless &> /dev/null ]
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -29,7 +29,7 @@ if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
fi fi
if [ $JAVA_VERSION = "openjdk-25-jre" ]; then if [ $JAVA_VERSION = "openjdk-25-jre" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s openjdk-25-jre-headless &> /dev/null if [ dpkg -s openjdk-25-jre-headless &> /dev/null ]
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -40,7 +40,7 @@ if [ $JAVA_VERSION = "openjdk-25-jre" ]; then
fi fi
elif [ $JAVA_VERSION = "msopenjdk-21" ]; then elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s msopenjdk-21 &> /dev/null if [ dpkg -s msopenjdk-21 &> /dev/null ]
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -53,7 +53,7 @@ elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
fi fi
elif [ $JAVA_VERSION = "msopenjdk-25" ]; then elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s msopenjdk-25 &> /dev/null if [ dpkg -s msopenjdk-25 &> /dev/null ]
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
testing/install_script.sh
+5 -5
View File
@@ -26,7 +26,7 @@ NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neof
# Install java # Install java
if [ $JAVA_VERSION = "openjdk-21-jre" ]; then if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s openjdk-21-jre-headless &> /dev/null if [ dpkg -s openjdk-21-jre-headless &> /dev/null ]
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -37,7 +37,7 @@ if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
fi fi
if [ $JAVA_VERSION = "openjdk-25-jre" ]; then if [ $JAVA_VERSION = "openjdk-25-jre" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s openjdk-25-jre-headless &> /dev/null if [ dpkg -s openjdk-25-jre-headless &> /dev/null ]
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -48,7 +48,7 @@ if [ $JAVA_VERSION = "openjdk-25-jre" ]; then
fi fi
elif [ $JAVA_VERSION = "msopenjdk-21" ]; then elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s msopenjdk-21 &> /dev/null if [ dpkg -s msopenjdk-21 &> /dev/null ]
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -61,7 +61,7 @@ elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
fi fi
elif [ $JAVA_VERSION = "msopenjdk-25" ]; then elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s msopenjdk-25 &> /dev/null if [ dpkg -s msopenjdk-25 &> /dev/null ]
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -347,4 +347,4 @@ echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION"
cd $MC_DIR cd $MC_DIR
exec ./run-$MC_TYPE-$MC_VERSION.sh exec ./run-$MC_TYPE-$MC_VERSION.sh
exit exit