diff options
| -rwxr-xr-x | localserver/build.sh | 43 | ||||
| -rwxr-xr-x | localserver/buildasan.sh | 1 | ||||
| -rwxr-xr-x | localserver/updater.sh | 44 |
3 files changed, 46 insertions, 42 deletions
diff --git a/localserver/build.sh b/localserver/build.sh index 90befdd..e861d0e 100755 --- a/localserver/build.sh +++ b/localserver/build.sh @@ -2,48 +2,7 @@ export DIR=`pwd` -# Apply beta.patch if it exists to server-data -# It will only exist on BETA SERVERS, though -if [ -e "./beta.patch" ] - then - echo "Apply beta.patch ........" - cd ../../server-data - git apply ../tools/localserver/beta.patch - cd $DIR - mv beta.patch .~beta.patch - ls - echo "........ Done." -fi - -# Apply beta.patch2 if it exists to server-code -# It will only exist on BETA SERVERS, though -if [ -e "./beta.patch2" ] - then - echo "Apply server updates ........" - sleep 1 - cd ../../server-code - git checkout -- src - echo "Rolling server back to correct version" - git diff master ce2dbb6acdc559ec256d1f9f9a779b8283064708 > x.diff - ls - head -n 25 x.diff - tail -n 40 x.diff - git apply --reject --whitespace=nowarn x.diff - git status - ls --recursive|grep ".rej" - cd ../tools/localserver - echo "Server code clean ........" - sleep 1 - python applicator.py - echo "Apply beta.patch2 ........" - cd ../../server-code - git apply ../tools/localserver/beta.patch2 - cd $DIR - #mv beta.patch2 .~beta.patch2 - ls - echo "........ Done." -fi - ./checktime.sh +./updater.sh source ./clean.sh ./build.sh old > /dev/null diff --git a/localserver/buildasan.sh b/localserver/buildasan.sh index 5c6d9f7..6ed4c05 100755 --- a/localserver/buildasan.sh +++ b/localserver/buildasan.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash export DIR=`pwd` +./updater.sh source ./clean.sh ./build.sh diff --git a/localserver/updater.sh b/localserver/updater.sh new file mode 100755 index 0000000..7aa1f2f --- /dev/null +++ b/localserver/updater.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +# Apply beta.patch if it exists to server-data +# It will only exist on BETA SERVERS, though +if [ -e "./beta.patch" ] + then + echo "Apply beta.patch ........" + cd ../../server-data + git apply ../tools/localserver/beta.patch + cd $DIR + mv beta.patch .~beta.patch + ls + echo "........ Done." +fi + +# Apply beta.patch2 if it exists to server-code +# It will only exist on BETA SERVERS, though +if [ -e "./beta.patch2" ] + then + echo "Apply server updates ........" + sleep 1 + cd ../../server-code + git checkout -- src + echo "Rolling server back to correct version" + git diff master ce2dbb6acdc559ec256d1f9f9a779b8283064708 > x.diff + ls + head -n 25 x.diff + tail -n 40 x.diff + git apply --reject --whitespace=nowarn x.diff + git status + ls --recursive|grep ".rej" + cd ../tools/localserver + echo "Server code clean ........" + sleep 1 + python applicator.py + echo "Apply beta.patch2 ........" + cd ../../server-code + git apply ../tools/localserver/beta.patch2 + cd $DIR + #mv beta.patch2 .~beta.patch2 + ls + echo "........ Done." +fi + |