Merge pull request #35 from indifferentbroccoli/Skip-Update-on-First-Boot

ARM Support, Commandline script, version checking fixes, patchline

Author: indifferentchicken

.github/workflows/developer.yml

@@ -28,6 +28,6 @@ jobs:
       - name: Docker - Build / Push
         uses: docker/build-push-action@v6
         with:
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: '${{ steps.meta.outputs.tags }}'

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v6
         with:
-          platforms: 'linux/amd64'
+          platforms: 'linux/amd64,linux/arm64'
           push: true
           tags: '${{ steps.meta.outputs.tags }}'
       - name: Docker Hub - Update README

Dockerfile

@@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     unzip \
     wget \
     ca-certificates \
+    qemu-user-static \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -35,6 +36,7 @@ ENV HOME=/home/hytale \
     AUTH_MODE=authenticated \
     ACCEPT_EARLY_PLUGINS=false \
     DOWNLOAD_ON_START=true \
+    PATCHLINE=release \
     SESSION_TOKEN="" \
     IDENTITY_TOKEN="" \
     OWNER_UUID=""

README.md

@@ -31,6 +31,7 @@ A Docker container for running a Hytale dedicated server with automatic download
 > - Server resource usage depends heavily on player count and view distance
 > - Higher view distances significantly increase RAM usage
 > - Hytale uses **QUIC over UDP** (not TCP) on port **5520**
+> - **ARM64/Apple Silicon supported** - The x86_64 downloader runs via QEMU emulation, while the Java server runs natively
 
 > [!IMPORTANT]
 > **First-Time Setup: Authentication Required**
@@ -117,6 +118,7 @@ You can use the following values to change the settings of the server on boot.
 | MIN_MEMORY             |                      | Minimum JVM heap size (e.g., 4G). Leave unset to omit -Xms flag                      |
 | MAX_MEMORY             | 8G                   | Maximum JVM heap size (e.g., 8G, 8192M)                                               |
 | JVM_ARGS               |                      | Custom JVM arguments (optional)                                                       |
+| PATCHLINE              | release              | Selects the patchline for the game (`release` or `pre-release`)                       |
 | DOWNLOAD_ON_START      | true                 | Automatically download/update server files on startup                                 |
 
 ## Port Configuration
@@ -194,6 +196,17 @@ Server files are automatically updated on restart if `DOWNLOAD_ON_START=true`. T
 docker-compose restart
 ```
 
+### Send commands to the server console
+```bash
+# Send a command to the running server
+docker exec -u hytale hytale command.sh "/auth status"
+
+# Other examples
+docker exec -u hytale hytale command.sh "/eventtitle 'Hello Indifferent Server'"
+docker exec -u hytale hytale command.sh "/kick player"
+docker exec -u hytale hytale command.sh "/op add player"
+```
+
 ## Support
 
 - [Official Hytale Server Manual](https://support.hytale.com/hc/en-us/articles/45326769420827-Hytale-Server-Manual)

scripts/command.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Helper script to send commands to the Hytale server console
+# Usage: send-command.sh <command>
+# Example: send-command.sh "/auth status"
+
+if [ $# -eq 0 ]; then
+    echo "Usage: $(basename "$0") <command>"
+    echo "Example: $(basename "$0") \"/auth status\""
+    exit 1
+fi
+
+# Find the hytale input pipe
+INPUT_PIPE=$(find /tmp -name "hytale_input_*" -type p 2>/dev/null | head -1)
+
+if [ -z "$INPUT_PIPE" ]; then
+    echo "Error: Hytale server input pipe not found. Is the server running?"
+    exit 1
+fi
+
+# Send the command
+echo "$*" > "$INPUT_PIPE"
+
+echo "Command sent: $*"

scripts/functions.sh

@@ -42,6 +42,15 @@ Log() {
 download_server() {
   LogAction "Checking server version"
 
+  # Check architecture and log if using QEMU
+  local ARCH=$(uname -m)
+  if [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then
+    LogInfo "Running on ARM64 architecture"
+    LogInfo "x86_64 downloader will use QEMU emulation"
+  else
+    LogInfo "Running on $ARCH architecture"
+  fi
+  
   local SERVER_FILES="/home/hytale/server-files"
   local DOWNLOADER_URL="https://downloader.hytale.com/hytale-downloader.zip"
   local DOWNLOADER_ZIP="$SERVER_FILES/hytale-downloader.zip"
@@ -81,22 +90,30 @@ download_server() {
   local CREDENTIALS_FILE="$DOWNLOADER_DIR/.hytale-downloader-credentials.json"
   local latest_version=""
   local current_version=""
+  local PATCHLINE="${PATCHLINE:-release}"
+  local DOWNLOADER_BASENAME
+  DOWNLOADER_BASENAME="$(basename "$DOWNLOADER_EXEC")"
+  
+  # Build downloader command with patchline
+  local DOWNLOADER_CMD="./$DOWNLOADER_BASENAME"
+  if [ "$PATCHLINE" != "release" ]; then
+    DOWNLOADER_CMD="$DOWNLOADER_CMD -patchline $PATCHLINE"
+    LogInfo "Using patchline: $PATCHLINE"
+  fi
 
   if [ ! -f "$CREDENTIALS_FILE" ]; then
     # First boot - no credentials yet, skip version check
     LogInfo "First time setup - authentication required"
   else
     # Check latest available version
     LogInfo "Checking latest version..."
-    latest_version=$(./$(basename "$DOWNLOADER_EXEC") -print-version)
-    
-    if [ -z "$latest_version" ]; then
+    if latest_version=$(eval "$DOWNLOADER_CMD -print-version" 2>/dev/null) && [ -n "$latest_version" ]; then
+      LogInfo "Latest available version: $latest_version"
+    else
       LogError "Failed to get latest version"
       return 1
     fi
 
-    LogInfo "Latest available version: $latest_version"
-    
     # Check current installed version
     if [ -f "$VERSION_FILE" ]; then
       current_version=$(cat "$VERSION_FILE")
@@ -116,7 +133,8 @@ download_server() {
   fi
 
   LogInfo "Downloading server files (this may take a while)..."
-  ./$(basename "$DOWNLOADER_EXEC") -download-path "$SERVER_FILES/game.zip" || {
+  cd "$(dirname "$DOWNLOADER_EXEC")" || exit 1
+  eval "$DOWNLOADER_CMD -download-path '$SERVER_FILES/game.zip'" || {
     LogError "Failed to download server files"
     return 1
   }
@@ -141,6 +159,14 @@ download_server() {
     return 1
   fi
 
+  # Get version if we don't have it yet (first boot or version check was skipped)
+  if [ -z "$latest_version" ]; then
+    cd "$(dirname "$DOWNLOADER_EXEC")" || exit 1
+    if latest_version=$(eval "$DOWNLOADER_CMD -print-version" 2>/dev/null) && [ -n "$latest_version" ]; then
+      LogInfo "Server version: $latest_version"
+    fi
+  fi
+
   # Remove outdated AOT cache only if this was an update
   if [ -n "$current_version" ] && [ "$current_version" != "$latest_version" ]; then
     if [ -f "$SERVER_FILES/Server/HytaleServer.aot" ]; then
@@ -150,9 +176,12 @@ download_server() {
   fi
 
   # Save version
-  echo "$latest_version" > "$VERSION_FILE"
-
-  LogSuccess "Server download completed (version $latest_version)"
+  if [ -n "$latest_version" ]; then
+    echo "$latest_version" > "$VERSION_FILE"
+    LogSuccess "Server download completed (version $latest_version)"
+  else
+    LogSuccess "Server download completed"
+  fi
 }
 
 # Attempt to shutdown the server gracefully

scripts/init.sh

@@ -72,6 +72,7 @@ export ACCEPT_EARLY_PLUGINS
 export MIN_MEMORY
 export MAX_MEMORY
 export JVM_ARGS
+export PATCHLINE
 export SESSION_TOKEN
 export IDENTITY_TOKEN
 export OWNER_UUID
@@ -92,6 +93,7 @@ su hytale -c "export PATH=\"$PATH\" && cd /home/hytale/server && \
     MIN_MEMORY='${MIN_MEMORY}' \
     MAX_MEMORY='${MAX_MEMORY}' \
     JVM_ARGS='${JVM_ARGS}' \
+    PATCHLINE='${PATCHLINE}' \
     SESSION_TOKEN='${SESSION_TOKEN}' \
     IDENTITY_TOKEN='${IDENTITY_TOKEN}' \
     OWNER_UUID='${OWNER_UUID}' \