diff --git a/docker-compose.yml b/docker-compose.yml index 0deb484..3a9244b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: papermc: volumes: - - 'papermc:/papermc' + - '~/papermc:/papermc' environment: - 'JAVA_TOOL_OPTIONS=-Xms6G -Xmx6G' ports: diff --git a/install.sh b/install.sh index fc05870..b13b1b7 100755 --- a/install.sh +++ b/install.sh @@ -15,6 +15,8 @@ sudo loginctl enable-linger $user mkdir -p /home/$user/.config/systemd/user +mkdir -p /home/$user/papermc + cp /home/$user/minecraft-deploy/docker-compose.yml /home/$user/docker-compose.yml cp /home/$user/minecraft-deploy/minecraft.service /home/$user/.config/systemd/user/minecraft.service diff --git a/payload.sh b/payload.sh index a1d5ee8..374efd8 100644 --- a/payload.sh +++ b/payload.sh @@ -1,6 +1,11 @@ #!/bin/bash set -euo pipefail -su -c "git clone https://git.itkeller.eu/aperture_science/minecraft-deploy.git ~/minecraft-deploy" arch +pacman --noconfirm -Sy git + +[ -d /home/arch/minecraft-deploy ] || su -c "git clone https://git.itkeller.eu/aperture_science/minecraft-deploy.git ~/minecraft-deploy" arch + +# something fishy is going on in the background +sleep 15 su -c "bash ~/minecraft-deploy/install.sh" arch