variable fixes
All checks were successful
Build and Push Minecraft Docker Images on Debian-base update / poll-debian-base-and-detect-changes (push) Successful in 8s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push fabric (push) Successful in 50s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push neoforged (push) Successful in 54s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push forge (push) Successful in 59s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push bukkit (push) Successful in 1m56s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing-forge (push) Successful in 1m37s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing-vanilla (push) Successful in 28s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing-neoforged (push) Successful in 1m47s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing-bukkit (push) Successful in 2m51s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing-fabric (push) Successful in 2m47s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push vanilla (push) Successful in 53s
Build and Push Minecraft Docker Images on Debian-base update / generate-changelogs (push) Successful in 7s
Build and Push Minecraft Docker Images on Debian-base update / generate-build-info (push) Successful in 3m43s
All checks were successful
Build and Push Minecraft Docker Images on Debian-base update / poll-debian-base-and-detect-changes (push) Successful in 8s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push fabric (push) Successful in 50s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push neoforged (push) Successful in 54s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push forge (push) Successful in 59s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push bukkit (push) Successful in 1m56s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing-forge (push) Successful in 1m37s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing-vanilla (push) Successful in 28s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing-neoforged (push) Successful in 1m47s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing-bukkit (push) Successful in 2m51s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing-fabric (push) Successful in 2m47s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push vanilla (push) Successful in 53s
Build and Push Minecraft Docker Images on Debian-base update / generate-changelogs (push) Successful in 7s
Build and Push Minecraft Docker Images on Debian-base update / generate-build-info (push) Successful in 3m43s
This commit is contained in:
@@ -46,66 +46,6 @@ if [ -f $MC_DIR/server.properties ]; then
|
||||
sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
|
||||
fi
|
||||
|
||||
# Check for EULA
|
||||
# if [ ! -f $MC_DIR/eula.txt ]; then
|
||||
# :
|
||||
# else
|
||||
# if [ "$ACCEPT_EULA" == "false" ]; then
|
||||
# if grep -rq 'eula=true' $MC_DIR/eula.txt; then
|
||||
# sed -i '/eula=true/c\eula=false' $MC_DIR/eula.txt
|
||||
# fi
|
||||
# echo " "
|
||||
# echo "WARNING ! EULA not accepted, you must accept the EULA"
|
||||
# echo " to start the Server, putting server in sleep mode"
|
||||
# sleep infinity
|
||||
# fi
|
||||
# fi
|
||||
|
||||
# if [ ! -f $MC_DIR/eula.txt ]; then
|
||||
# echo " "
|
||||
# echo "WARNING ! EULA not found please stand by..."
|
||||
# sleep 5
|
||||
# fi
|
||||
# if [ "$ACCEPT_EULA" == "true" ]; then
|
||||
# if grep -rq 'eula=false' $MC_DIR/eula.txt; then
|
||||
# sed -i '/eula=false/c\eula=true' $MC_DIR/eula.txt
|
||||
# echo " "
|
||||
# echo "INFO ! EULA accepted, server restarting, please wait..."
|
||||
# sleep 1
|
||||
# cd $MC_DIR
|
||||
# exec ./run-$MC_VERSION-$FORGE_VERSION.sh nogui
|
||||
# exit 0
|
||||
# fi
|
||||
# elif [ "$ACCEPT_EULA" == "false" ]; then
|
||||
# echo " "
|
||||
# echo "WARNING ! EULA not accepted, you must accept the EULA"
|
||||
# echo " to start the Server, putting server in sleep mode"
|
||||
# sleep infinity
|
||||
# else
|
||||
# echo " "
|
||||
# echo "WARNING ! Something went wrong, please check EULA variable"
|
||||
# fi
|
||||
|
||||
# Test EULA
|
||||
# if [ ! -f "$EULA_FILE" ]; then
|
||||
# echo "WARNING ! EULA not found, waiting for generation..."
|
||||
# sleep 5
|
||||
# fi
|
||||
|
||||
# if [ "$ACCEPT_EULA" = "true" ]; then
|
||||
# sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null
|
||||
# echo "INFO ! EULA accepted"
|
||||
|
||||
# elif [ "$ACCEPT_EULA" = "false" ]; then
|
||||
# sed -i 's/eula=true/eula=false/' "$EULA_FILE" 2>/dev/null
|
||||
# echo "WARNING ! EULA not accepted, server will not start"
|
||||
# sleep infinity
|
||||
|
||||
# else
|
||||
# echo "WARNING ! ACCEPT_EULA must be set to true or false"
|
||||
# sleep infinity
|
||||
# fi
|
||||
|
||||
# Wait briefly for installer/server to generate eula.txt
|
||||
if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
|
||||
echo "INFO ! Waiting for EULA generation..."
|
||||
@@ -121,17 +61,13 @@ fi
|
||||
# First-time decision
|
||||
if [ "$ACCEPT_EULA" = "true" ]; then
|
||||
echo "INFO ! Accepting EULA (one-time)"
|
||||
|
||||
sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
|
||||
|| echo "eula=true" > "$EULA_FILE"
|
||||
|
||||
touch "$EULA_MARKER"
|
||||
|
||||
elif [ "$ACCEPT_EULA" = "false" ]; then
|
||||
echo "WARNING ! EULA not accepted on first run"
|
||||
echo "WARNING ! Set ACCEPT_EULA=true to proceed"
|
||||
sleep infinity
|
||||
|
||||
else
|
||||
echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
|
||||
sleep infinity
|
||||
|
||||
Reference in New Issue
Block a user