diff options
-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!" + |