diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-07-30 00:58:15 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-07-30 00:58:15 -0300 |
| commit | 94588ed14f0c6491bb1af0877cd1506f836b2c86 (patch) | |
| tree | b2bf9cadbdbf8d1c1dfa53dfe454b230afd66493 /.tools/scripts | |
| parent | 057c595824a5ef93f4461054987c6cc8afdd2a7b (diff) | |
| download | serverdata-94588ed14f0c6491bb1af0877cd1506f836b2c86.tar.gz serverdata-94588ed14f0c6491bb1af0877cd1506f836b2c86.tar.bz2 serverdata-94588ed14f0c6491bb1af0877cd1506f836b2c86.tar.xz serverdata-94588ed14f0c6491bb1af0877cd1506f836b2c86.zip | |
Apply beta.patch2
Diffstat (limited to '.tools/scripts')
| -rwxr-xr-x | .tools/scripts/init.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh index 2bdeebc42..8fb823781 100755 --- a/.tools/scripts/init.sh +++ b/.tools/scripts/init.sh @@ -110,6 +110,12 @@ function aptget_install { function make_server { ls -la ../server-data ls -la ../server-data/plugins + if [ -e "../server-data/.tools/beta.patch2" ] + then + echo "Apply beta.patch2 ........" + git apply ../server-data/.tools/beta.patch2 + echo "........ Done." + fi echo source src/evol/tools/vars.sh source ./src/evol/tools/vars.sh check_error $? @@ -175,14 +181,14 @@ function do_init { cd server-code/src ; git checkout master # v2018.09.23 # 2018-09-24 # s20180713? check_error $? #: ' #Use this to force an old version. You need s20190422 for this. - echo "Begin diff experiment" + echo "Rolling server back to correct version" cd .. git diff master 41b5d5e9b6f14fd26197958aec29a02858dff299 > x.diff ls head -n 25 x.diff tail -n 40 x.diff git apply --reject --whitespace=nowarn x.diff - echo "====================================== DIFFED" + echo "====================================== CHANGES APPLIED" git status ls --recursive|grep ".rej" echo "====================================== Continuing..." |