variable fixes

testing-bukkit/install_script.sh

@@ -3,6 +3,8 @@
 # All rights reserved
 
 MC_DIR=/MCserver
+EULA_FILE=$MC_DIR/eula.txt
+EULA_MARKER=$MC_DIR/.eula_accepted
 
 # Main Install Links
 INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
@@ -43,44 +45,31 @@ 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
+# Wait briefly for installer/server to generate eula.txt
+if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
+    echo "INFO ! Waiting for EULA generation..."
+    sleep 5
 fi
 
-if [ ! -f $MC_DIR/eula.txt ]; then
-	echo " "
-	echo "WARNING ! EULA not found please stand by..."
-	sleep 5
+# If EULA already accepted once, never touch it again
+if [ -f "$EULA_MARKER" ]; then
+    echo "INFO ! EULA previously accepted"
+    return 0 2>/dev/null || true
 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
+
+# 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 " "
-	echo "WARNING ! Something went wrong, please check EULA variable"
+    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
+    sleep infinity
 fi
 
 # Set permissions.