diff --git a/docker-compose.yml b/docker-compose.yml index f804533..4a388f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -132,6 +132,6 @@ services: # Saves go here now - ./valley_saves:/config/xdg/config/StardewValley/Saves # If you'd like to set an existing savegame before the first start otherwise this file will be edited when starting the first game - - ./configs/autoload.json:/data/Stardew/Stardew Valley/game/Mods/AutoLoadGame/config.json + - ./configs/autoload.json:/data/Stardew/game/Mods/AutoLoadGame/config.json diff --git a/docker/Dockerfile b/docker/Dockerfile index 7d9b3b0..ebbc5de 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,14 +24,14 @@ RUN wget -qO dotnet.tar.gz https://download.visualstudio.microsoft.com/download/ RUN wget https://mirror.cloudcraft.info/SMAPI_latest.zip -qO /data/nexus.zip && \ unzip /data/nexus.zip -d /data/nexus/ && \ - /bin/bash -c "SMAPI_NO_TERMINAL=true SMAPI_USE_CURRENT_SHELL=true echo -e \"2\n\n\" | /data/nexus/SMAPI\ 4.0.1\ installer/internal/linux/SMAPI.Installer --install --game-path \"/data/Stardew/Stardew Valley/game\"" || : + /bin/bash -c "SMAPI_NO_TERMINAL=true SMAPI_USE_CURRENT_SHELL=true echo -e \"2\n\n\" | /data/nexus/SMAPI\ 4.0.1\ installer/internal/linux/SMAPI.Installer --install --game-path \"/data/Stardew/game\"" || : # Add Mods & Scripts -COPY ["mods/", "/data/Stardew/Stardew Valley/game/Mods/"] +COPY ["mods/", "/data/Stardew/game/Mods/"] COPY scripts/ /opt/ -RUN chmod +x /data/Stardew/Stardew\ Valley/game/StardewValley && \ +RUN chmod +x /data/Stardew/game/StardewValley && \ chmod -R 777 /data/Stardew/ && \ chown -R 1000:1000 /data/Stardew && \ chmod +x /opt/*.sh diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 15f68f5..f8d70a6 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash export HOME=/config -for modPath in /data/Stardew/Stardew\ Valley/game/Mods/*/ +for modPath in /data/Stardew/game/Mods/*/ do mod=$(basename "$modPath") @@ -33,10 +33,8 @@ done # Ready to start! export XAUTHORITY=~/.Xauthority -sed -i 's/env TERM=xterm $LAUNCHER "$@"/env SHELL=\/bin\/bash TERM=xterm xterm -e "\/bin\/bash -c $LAUNCHER \"$@\""/' /data/Stardew/Stardew\ Valley/game/Stardew\ Valley +sed -i 's/env TERM=xterm $LAUNCHER "$@"/env SHELL=\/bin\/bash TERM=xterm xterm -e "\/bin\/bash -c $LAUNCHER \"$@\""/' /data/Stardew/game/Stardew\ Valley - -# bash -c "/data/Stardew/Stardew\ Valley/game/Stardew\ Valley" -bash -c "/data/Stardew/Stardew\ Valley/start.sh" +bash -c "/data/Stardew/start.sh" sleep 233333333333333 diff --git a/docker/run b/docker/run index c300da8..341fbb3 100644 --- a/docker/run +++ b/docker/run @@ -1,5 +1,5 @@ #!/bin/sh -if [ -z "`cat /data/Stardew/Stardew\ Valley/game/Mods/AutoLoadGame/config.json`" ] ; then - chmod 777 /data/Stardew/Stardew\ Valley/game/Mods/AutoLoadGame/config.json; +if [ -z "`cat /data/Stardew/game/Mods/AutoLoadGame/config.json`" ] ; then + chmod 777 /data/Stardew/game/Mods/AutoLoadGame/config.json; fi diff --git a/docker/scripts/configure-remotecontrol-mod.sh b/docker/scripts/configure-remotecontrol-mod.sh index ef4e1ea..3515e8f 100644 --- a/docker/scripts/configure-remotecontrol-mod.sh +++ b/docker/scripts/configure-remotecontrol-mod.sh @@ -1,10 +1,10 @@ #!/bin/sh # Quit if we don't have any default admins -if [ -z "${REMOTE_CONTROL_DEFAULT_ADMINS}" ] || [ ! -f "/data/Stardew/Stardew Valley/game/Mods/RemoteControl/config.json" ]; then +if [ -z "${REMOTE_CONTROL_DEFAULT_ADMINS}" ] || [ ! -f "/data/Stardew/game/Mods/RemoteControl/config.json" ]; then return fi # Add default admins to the admin list -jq ".admins[.admins | length] |= . + ${REMOTE_CONTROL_DEFAULT_ADMINS}" "/data/Stardew/Stardew Valley/game/Mods/RemoteControl/config.json" > "/data/Stardew/Stardew Valley/game/Mods/RemoteControl/config.json.out" -mv -f "/data/Stardew/Stardew Valley/game/Mods/RemoteControl/config.json.out" "/data/Stardew/Stardew Valley/game/Mods/RemoteControl/config.json" +jq ".admins[.admins | length] |= . + ${REMOTE_CONTROL_DEFAULT_ADMINS}" "/data/Stardew/game/Mods/RemoteControl/config.json" > "/data/Stardew/game/Mods/RemoteControl/config.json.out" +mv -f "/data/Stardew/game/Mods/RemoteControl/config.json.out" "/data/Stardew/game/Mods/RemoteControl/config.json"