diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-09-13 00:55:02 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-09-13 00:55:02 -0300 |
| commit | 2ef4e8700a5acd5ea4bd79c9b636004df7002118 (patch) | |
| tree | 8495b5b2c756c8011401b5aba3493c504656b182 | |
| parent | 78f07a85e0e1f638a508fbdab7059d49afd0d422 (diff) | |
| download | tools-2ef4e8700a5acd5ea4bd79c9b636004df7002118.tar.gz tools-2ef4e8700a5acd5ea4bd79c9b636004df7002118.tar.bz2 tools-2ef4e8700a5acd5ea4bd79c9b636004df7002118.tar.xz tools-2ef4e8700a5acd5ea4bd79c9b636004df7002118.zip | |
`make news` will now update gameinfo (if possible) as well!
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | web/gameinfo.sh | 18 |
2 files changed, 20 insertions, 0 deletions
@@ -59,6 +59,8 @@ news: @cd ../web ; echo "Checking for web/ folder..." # check if web directory exists cd web ; ./deploy.sh @echo "News updated, please commit result on web." + @cd ../gameinfo-api ; echo "Checking for gameinfo-api/ folder..." # check + cd web ; ./gameinfo.sh .PHONY: client client: diff --git a/web/gameinfo.sh b/web/gameinfo.sh new file mode 100755 index 0000000..0a19e5d --- /dev/null +++ b/web/gameinfo.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +echo "Begin - Gameinfo updater. User input required." +cd ../../gameinfo-api + +cd serverdata +git pull --rebase -X theirs +cd .. + +cd clientdata +git pull --rebase -X theirs +cd .. + +git commit -a +git push + +echo "Gameinfo updated!" + |