diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-03-16 13:51:16 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-03-16 13:51:16 -0300 |
| commit | 28a4eb4e8b34a20ae83ccbf7fea52f03757b23be (patch) | |
| tree | badaebfb495fc478578d33e131a14a066a39e8d0 /herculeswrapper/include.sh | |
| parent | a958a4b5b5c6b81b0bf184c75721a49c3cfb48dd (diff) | |
| download | tools-28a4eb4e8b34a20ae83ccbf7fea52f03757b23be.tar.gz tools-28a4eb4e8b34a20ae83ccbf7fea52f03757b23be.tar.bz2 tools-28a4eb4e8b34a20ae83ccbf7fea52f03757b23be.tar.xz tools-28a4eb4e8b34a20ae83ccbf7fea52f03757b23be.zip | |
Fix the wrapper so @serverexit 104 works, and remove @serverexit 105+
Diffstat (limited to 'herculeswrapper/include.sh')
| -rw-r--r-- | herculeswrapper/include.sh | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/herculeswrapper/include.sh b/herculeswrapper/include.sh index 1c8990c..24090cd 100644 --- a/herculeswrapper/include.sh +++ b/herculeswrapper/include.sh @@ -53,25 +53,9 @@ function hard_reset { } function pull_all { - hard_reset "data" - #cd ../client-data - #hard_reset "client" - #cd ../music - #hard_reset "music" - cd ../server-code - hard_reset "code" - cd src/evol - hard_reset "plugin" - cd ../../../tools - hard_reset "tools" - cd .. - ./pull.sh - cd server-data - git_merge cd ../ - ./status.sh + ./pull.sh force cd server-data - make maps } function build_all { |