Skip to content
Snippets Groups Projects
Commit 42f7cb2c authored by Peter Nerlich's avatar Peter Nerlich
Browse files

fix update.sh, patch advtrains_luaautomation_sync if present

parent 214ec67f
No related branches found
No related tags found
No related merge requests found
Pipeline #47657 passed
...@@ -7,10 +7,16 @@ echo "reset target is $target" ...@@ -7,10 +7,16 @@ echo "reset target is $target"
# update meta repo # update meta repo
git fetch origin "$target" git fetch origin "$target"
# use the latest commit on master, discard any local changes # use the latest commit on master, discard any local changes
git reset --hard "$target" git reset --hard "origin/$target"
# sync repo urls # sync repo urls
git submodule sync --recursive git submodule sync --recursive
# update commits, discard any local changes # update commits, discard any local changes
git submodule update --init --recursive --force git submodule update --init --recursive --force
# remove unversioned files # remove unversioned files
git clean -dff 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment