From 4ebfbedb226654376b033fc2f40583ef9f18fd17 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sun, 28 Feb 2021 12:10:10 +0100 Subject: [PATCH] Make update script actually work --- games/MineClone2 | 2 +- scripts/update.sh | 7 ++++++- textures/server | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/games/MineClone2 b/games/MineClone2 index 793b5f6..9f66238 160000 --- a/games/MineClone2 +++ b/games/MineClone2 @@ -1 +1 @@ -Subproject commit 793b5f616e773662f8e2e65e0afcd43093831b64 +Subproject commit 9f66238aaaa941ec23084ede1f173624490320d2 diff --git a/scripts/update.sh b/scripts/update.sh index a9b1c1d..c7ea0b4 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -3,7 +3,12 @@ # Update all software used by the server # Pull repository -git pull --recurse-submodules +git pull + +# Update submodules +git submodule init +git submodule update +git submodule foreach "git fetch origin; git checkout $(git rev-parse --abbrev-ref HEAD); git reset --hard origin/$(git rev-parse --abbrev-ref HEAD); git submodule update --recursive; git clean -dfx" # Update minetest and screen sudo apt-get update -y diff --git a/textures/server b/textures/server index 06a4999..900d3f2 160000 --- a/textures/server +++ b/textures/server @@ -1 +1 @@ -Subproject commit 06a4999a55d5c49c7b9b4aaac359634f0d46d435 +Subproject commit 900d3f2646ec56e6ba35b958ecac3fe11b8a2f44 -- 2.44.0