added run files back until i can fix the problem with autogen
minecraft-build-bukkit / Docker prune (vm-docker-build2) (push) Successful in 3s
minecraft-build-fabric / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-quilt / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-testing / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-vanilla / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-bukkit / poll-debian-base-and-detect-changes (push) Successful in 19s
minecraft-build-fabric / poll-debian-base-and-detect-changes (push) Successful in 19s
minecraft-build-testing / poll-debian-base-and-detect-changes (push) Successful in 9s
minecraft-build-quilt / poll-debian-base-and-detect-changes (push) Successful in 10s
minecraft-build-vanilla / poll-debian-base-and-detect-changes (push) Successful in 11s
minecraft-build-bukkit / Build and Push bukkit (push) Successful in 16s
minecraft-build-fabric / Build and Push fabric (push) Successful in 18s
minecraft-build-quilt / Build and Push quilt (push) Successful in 17s
minecraft-build-vanilla / Build and Push vanilla (push) Successful in 11s
minecraft-build-testing / Build and Push testing (push) Successful in 16s
minecraft-build-bukkit / generate-changelogs (push) Successful in 7s
minecraft-build-fabric / generate-changelogs (push) Failing after 6s
minecraft-build-fabric / generate-build-info (push) Skipped
minecraft-build-quilt / generate-changelogs (push) Successful in 6s
minecraft-build-vanilla / generate-changelogs (push) Successful in 7s
minecraft-build-testing / generate-changelogs (push) Successful in 6s
minecraft-build-bukkit / generate-build-info (push) Failing after 8s
minecraft-build-quilt / generate-build-info (push) Successful in 8s
minecraft-build-vanilla / generate-build-info (push) Successful in 10s
minecraft-build-testing / generate-build-info (push) Successful in 9s
minecraft-build-bukkit / Docker prune (vm-docker-build2) (push) Successful in 3s
minecraft-build-fabric / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-quilt / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-testing / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-vanilla / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-bukkit / poll-debian-base-and-detect-changes (push) Successful in 19s
minecraft-build-fabric / poll-debian-base-and-detect-changes (push) Successful in 19s
minecraft-build-testing / poll-debian-base-and-detect-changes (push) Successful in 9s
minecraft-build-quilt / poll-debian-base-and-detect-changes (push) Successful in 10s
minecraft-build-vanilla / poll-debian-base-and-detect-changes (push) Successful in 11s
minecraft-build-bukkit / Build and Push bukkit (push) Successful in 16s
minecraft-build-fabric / Build and Push fabric (push) Successful in 18s
minecraft-build-quilt / Build and Push quilt (push) Successful in 17s
minecraft-build-vanilla / Build and Push vanilla (push) Successful in 11s
minecraft-build-testing / Build and Push testing (push) Successful in 16s
minecraft-build-bukkit / generate-changelogs (push) Successful in 7s
minecraft-build-fabric / generate-changelogs (push) Failing after 6s
minecraft-build-fabric / generate-build-info (push) Skipped
minecraft-build-quilt / generate-changelogs (push) Successful in 6s
minecraft-build-vanilla / generate-changelogs (push) Successful in 7s
minecraft-build-testing / generate-changelogs (push) Successful in 6s
minecraft-build-bukkit / generate-build-info (push) Failing after 8s
minecraft-build-quilt / generate-build-info (push) Successful in 8s
minecraft-build-vanilla / generate-build-info (push) Successful in 10s
minecraft-build-testing / generate-build-info (push) Successful in 9s
This commit is contained in:
+11
-16
@@ -8,6 +8,7 @@ EULA_MARKER=$MC_DIR/.eula_accepted
|
|||||||
|
|
||||||
# Main Install Links
|
# Main Install Links
|
||||||
INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
|
INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
|
||||||
|
MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/run.sh
|
||||||
|
|
||||||
# Install java
|
# Install java
|
||||||
if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
|
if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
|
||||||
@@ -47,24 +48,18 @@ if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
|
|||||||
mv $MC_DIR/craftbukkit-*.sh $MC_DIR/old-server-versions/
|
mv $MC_DIR/craftbukkit-*.sh $MC_DIR/old-server-versions/
|
||||||
wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O $MC_DIR/craftbukkit-$MC_VERSION.jar
|
wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O $MC_DIR/craftbukkit-$MC_VERSION.jar
|
||||||
chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
|
chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Looking for run-${MC_VERSION}.sh
|
||||||
|
if [ -e $MC_DIR/run-$MC_VERSION.sh ]
|
||||||
|
then
|
||||||
echo " "
|
echo " "
|
||||||
echo "WARNING ! run.sh is out of date/missing ... will generate now."
|
echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
|
||||||
|
else
|
||||||
|
echo " "
|
||||||
|
echo "WARNING ! run.sh is out of date/missing ... will download now."
|
||||||
mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
|
mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
|
||||||
tee $MC_DIR/run-$MC_VERSION.sh <<-EOF
|
wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
|
||||||
#!/bin/bash
|
|
||||||
# Copyright (c) 2022 fithwum
|
|
||||||
# All rights reserved
|
|
||||||
#
|
|
||||||
cd /MCserver
|
|
||||||
JAR=./craftbukkit-*.jar
|
|
||||||
#
|
|
||||||
while [ true ]; do
|
|
||||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
EOF
|
|
||||||
chmod +x $MC_DIR/run-$MC_VERSION.sh
|
chmod +x $MC_DIR/run-$MC_VERSION.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Copyright (c) 2022 fithwum
|
||||||
|
# All rights reserved
|
||||||
|
|
||||||
|
cd /MCserver
|
||||||
|
JAR=./craftbukkit-*.jar
|
||||||
|
|
||||||
|
while [ true ]; do
|
||||||
|
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
+11
-16
@@ -8,6 +8,7 @@ EULA_MARKER=$MC_DIR/.eula_accepted
|
|||||||
|
|
||||||
# Main Install Links
|
# Main Install Links
|
||||||
SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$INSTALLER_VERSION/server/jar
|
SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$INSTALLER_VERSION/server/jar
|
||||||
|
MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/run.sh
|
||||||
|
|
||||||
# Install java
|
# Install java
|
||||||
if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
|
if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
|
||||||
@@ -47,24 +48,18 @@ if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
|
|||||||
mv $MC_DIR/fabric-*-*.jar $MC_DIR/old-server-versions/
|
mv $MC_DIR/fabric-*-*.jar $MC_DIR/old-server-versions/
|
||||||
wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
||||||
chmod +x $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
chmod +x $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Looking for run.sh
|
||||||
|
if [ -e $MC_DIR/run-$MC_VERSION.sh ]
|
||||||
|
then
|
||||||
echo " "
|
echo " "
|
||||||
echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now."
|
echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
|
||||||
|
else
|
||||||
|
echo " "
|
||||||
|
echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
|
||||||
mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
|
mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
|
||||||
tee $MC_DIR/run-$MC_VERSION.sh <<-EOF
|
wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
|
||||||
#!/bin/bash
|
|
||||||
# Copyright (c) 2022 fithwum
|
|
||||||
# All rights reserved
|
|
||||||
#
|
|
||||||
cd /MCserver
|
|
||||||
JAR=./fabric-*-*.jar
|
|
||||||
#
|
|
||||||
while [ true ]; do
|
|
||||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
EOF
|
|
||||||
chmod +x $MC_DIR/run-$MC_VERSION.sh
|
chmod +x $MC_DIR/run-$MC_VERSION.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Copyright (c) 2022 fithwum
|
||||||
|
# All rights reserved
|
||||||
|
|
||||||
|
cd /MCserver
|
||||||
|
JAR=./fabric-*-*.jar
|
||||||
|
|
||||||
|
while [ true ]; do
|
||||||
|
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
+11
-17
@@ -8,6 +8,7 @@ EULA_MARKER=$MC_DIR/.eula_accepted
|
|||||||
|
|
||||||
# Main Install Links
|
# Main Install Links
|
||||||
INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
|
INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
|
||||||
|
MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/quilt/run.sh
|
||||||
|
|
||||||
# Install java
|
# Install java
|
||||||
if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
|
if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
|
||||||
@@ -55,27 +56,20 @@ if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ]
|
|||||||
mv * /$MC_DIR
|
mv * /$MC_DIR
|
||||||
cd ..
|
cd ..
|
||||||
rm -fr server
|
rm -fr server
|
||||||
|
cd ..
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Looking for run.sh
|
||||||
|
if [ -e $MC_DIR/run-$MC_VERSION.sh ]
|
||||||
|
then
|
||||||
echo " "
|
echo " "
|
||||||
echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now."
|
echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
|
||||||
|
else
|
||||||
|
echo " "
|
||||||
|
echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
|
||||||
mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
|
mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
|
||||||
wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh
|
wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh
|
||||||
tee $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh <<-EOF
|
|
||||||
#!/bin/bash
|
|
||||||
# Copyright (c) 2022 fithwum
|
|
||||||
# All rights reserved
|
|
||||||
#
|
|
||||||
cd /MCserver
|
|
||||||
JAR=./quilt-server-launch.jar
|
|
||||||
#
|
|
||||||
while [ true ]; do
|
|
||||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
EOF
|
|
||||||
chmod +x $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh
|
chmod +x $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh
|
||||||
cd ..
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "INFO ! Setting game port."
|
echo "INFO ! Setting game port."
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Copyright (c) 2022 fithwum
|
||||||
|
# All rights reserved
|
||||||
|
|
||||||
|
cd /MCserver
|
||||||
|
JAR=./quilt-server-launch.jar
|
||||||
|
|
||||||
|
while [ true ]; do
|
||||||
|
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
+82
-12
@@ -62,14 +62,15 @@ if [ $MC_TYPE = "vanilla" ]; then
|
|||||||
echo " "
|
echo " "
|
||||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||||
mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions
|
mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions
|
||||||
tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
|
|
||||||
|
cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Copyright (c) 2022 fithwum
|
# Copyright (c) 2022 fithwum
|
||||||
# All rights reserved
|
# All rights reserved
|
||||||
#
|
|
||||||
cd /MCserver
|
cd /MCserver
|
||||||
JAR=./MCserver-*.jar
|
JAR=./MCserver-*.jar
|
||||||
#
|
|
||||||
while [ true ]; do
|
while [ true ]; do
|
||||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
@@ -77,6 +78,22 @@ if [ $MC_TYPE = "vanilla" ]; then
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
# tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
|
||||||
|
# #!/bin/bash
|
||||||
|
# # Copyright (c) 2022 fithwum
|
||||||
|
# # All rights reserved
|
||||||
|
#
|
||||||
|
# cd /MCserver
|
||||||
|
# JAR=./MCserver-*.jar
|
||||||
|
#
|
||||||
|
# while [ true ]; do
|
||||||
|
# java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||||
|
# if [ $? -eq 0 ]; then
|
||||||
|
# break
|
||||||
|
# fi
|
||||||
|
# done
|
||||||
|
# EOF
|
||||||
chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
|
chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -100,14 +117,15 @@ elif [ $MC_TYPE = "bukkit" ]; then
|
|||||||
chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
|
chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
|
||||||
echo " "
|
echo " "
|
||||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||||
tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
|
|
||||||
|
cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Copyright (c) 2022 fithwum
|
# Copyright (c) 2022 fithwum
|
||||||
# All rights reserved
|
# All rights reserved
|
||||||
#
|
|
||||||
cd /MCserver
|
cd /MCserver
|
||||||
JAR=./craftbukkit-*.jar
|
JAR=./craftbukkit-*.jar
|
||||||
#
|
|
||||||
while [ true ]; do
|
while [ true ]; do
|
||||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
@@ -115,6 +133,22 @@ elif [ $MC_TYPE = "bukkit" ]; then
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
# tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
|
||||||
|
# #!/bin/bash
|
||||||
|
# # Copyright (c) 2022 fithwum
|
||||||
|
# # All rights reserved
|
||||||
|
#
|
||||||
|
# cd /MCserver
|
||||||
|
# JAR=./craftbukkit-*.jar
|
||||||
|
#
|
||||||
|
# while [ true ]; do
|
||||||
|
# java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||||
|
# if [ $? -eq 0 ]; then
|
||||||
|
# break
|
||||||
|
# fi
|
||||||
|
# done
|
||||||
|
# EOF
|
||||||
chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
|
chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -138,14 +172,15 @@ elif [ $MC_TYPE = "fabric" ]; then
|
|||||||
chmod +x $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
chmod +x $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
||||||
echo " "
|
echo " "
|
||||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||||
tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
|
|
||||||
|
cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Copyright (c) 2022 fithwum
|
# Copyright (c) 2022 fithwum
|
||||||
# All rights reserved
|
# All rights reserved
|
||||||
#
|
|
||||||
cd /MCserver
|
cd /MCserver
|
||||||
JAR=./fabric-*-*.jar
|
JAR=./fabric-*-*.jar
|
||||||
#
|
|
||||||
while [ true ]; do
|
while [ true ]; do
|
||||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
@@ -153,6 +188,23 @@ elif [ $MC_TYPE = "fabric" ]; then
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
# tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
|
||||||
|
# #!/bin/bash
|
||||||
|
# # Copyright (c) 2022 fithwum
|
||||||
|
# # All rights reserved
|
||||||
|
#
|
||||||
|
# cd /MCserver
|
||||||
|
# JAR=./fabric-*-*.jar
|
||||||
|
#
|
||||||
|
# while [ true ]; do
|
||||||
|
# java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||||
|
# if [ $? -eq 0 ]; then
|
||||||
|
# break
|
||||||
|
# fi
|
||||||
|
# done
|
||||||
|
# EOF
|
||||||
|
|
||||||
chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
|
chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -181,14 +233,15 @@ elif [ $MC_TYPE = "quilt" ]; then
|
|||||||
rm -fr server
|
rm -fr server
|
||||||
echo " "
|
echo " "
|
||||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||||
tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
|
|
||||||
|
cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Copyright (c) 2022 fithwum
|
# Copyright (c) 2022 fithwum
|
||||||
# All rights reserved
|
# All rights reserved
|
||||||
#
|
|
||||||
cd /MCserver
|
cd /MCserver
|
||||||
JAR=./quilt-server-launch.jar
|
JAR=./quilt-server-launch.jar
|
||||||
#
|
|
||||||
while [ true ]; do
|
while [ true ]; do
|
||||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
@@ -196,6 +249,23 @@ elif [ $MC_TYPE = "quilt" ]; then
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
# tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
|
||||||
|
# #!/bin/bash
|
||||||
|
# # Copyright (c) 2022 fithwum
|
||||||
|
# # All rights reserved
|
||||||
|
#
|
||||||
|
# cd /MCserver
|
||||||
|
# JAR=./quilt-server-launch.jar
|
||||||
|
#
|
||||||
|
# while [ true ]; do
|
||||||
|
# java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||||
|
# if [ $? -eq 0 ]; then
|
||||||
|
# break
|
||||||
|
# fi
|
||||||
|
# done
|
||||||
|
# EOF
|
||||||
|
|
||||||
chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
|
chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
|
||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
|
|||||||
+11
-16
@@ -8,6 +8,7 @@ EULA_MARKER=$MC_DIR/.eula_accepted
|
|||||||
|
|
||||||
VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
|
VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
|
||||||
MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
|
MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
|
||||||
|
MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/vanilla/run.sh
|
||||||
|
|
||||||
# Install java
|
# Install java
|
||||||
if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
|
if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
|
||||||
@@ -47,24 +48,18 @@ if [ -e $MC_DIR/MCserver-$MC_VERSION.jar ]
|
|||||||
mv $MC_DIR/MCserver-*.jar $MC_DIR/old-server-versions/
|
mv $MC_DIR/MCserver-*.jar $MC_DIR/old-server-versions/
|
||||||
wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O $MC_DIR/MCserver-$MC_VERSION.jar
|
wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O $MC_DIR/MCserver-$MC_VERSION.jar
|
||||||
chmod +x $MC_DIR/MCserver-$MC_VERSION.jar
|
chmod +x $MC_DIR/MCserver-$MC_VERSION.jar
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Looking for run-${MC_VERSION}.sh
|
||||||
|
if [ -e $MC_DIR/run-$MC_VERSION.sh ]
|
||||||
|
then
|
||||||
echo " "
|
echo " "
|
||||||
echo "WARNING ! run.sh is out of date/missing ... will generate now."
|
echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
|
||||||
|
else
|
||||||
|
echo " "
|
||||||
|
echo "WARNING ! run.sh is out of date/missing ... will download now."
|
||||||
mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
|
mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
|
||||||
tee $MC_DIR/run-$MC_VERSION.sh <<-EOF
|
wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
|
||||||
#!/bin/bash
|
|
||||||
# Copyright (c) 2022 fithwum
|
|
||||||
# All rights reserved
|
|
||||||
#
|
|
||||||
cd /MCserver
|
|
||||||
JAR=./MCserver-*.jar
|
|
||||||
#
|
|
||||||
while [ true ]; do
|
|
||||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
EOF
|
|
||||||
chmod +x $MC_DIR/run-$MC_VERSION.sh
|
chmod +x $MC_DIR/run-$MC_VERSION.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Copyright (c) 2022 fithwum
|
||||||
|
# All rights reserved
|
||||||
|
|
||||||
|
cd /MCserver
|
||||||
|
JAR=./MCserver-*.jar
|
||||||
|
|
||||||
|
while [ true ]; do
|
||||||
|
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
Reference in New Issue
Block a user