From 42f7cb2c2b6f96d2786238f1966094cf5c70300e Mon Sep 17 00:00:00 2001 From: Peter Nerlich <peter.nerlich+dev@googlemail.com> Date: Sat, 23 Oct 2021 12:28:53 +0200 Subject: [PATCH] fix update.sh, patch advtrains_luaautomation_sync if present --- update.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 6382ca3..e93253a 100755 --- a/update.sh +++ b/update.sh @@ -7,10 +7,16 @@ echo "reset target is $target" # update meta repo git fetch origin "$target" # use the latest commit on master, discard any local changes -git reset --hard "$target" +git reset --hard "origin/$target" # sync repo urls git submodule sync --recursive # update commits, discard any local changes git submodule update --init --recursive --force # remove unversioned files git clean -dff + + +[ -d advtrains_luaautomation_sync ] && +advtrains_luaautomation_sync/clean.sh && +cp -r advtrains/advtrains_luaautomation advtrains_luaautomation_sync/patched && +advtrains_luaautomation_sync/apply_patch.sh -- GitLab