summaryrefslogtreecommitdiff
path: root/localserver
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-09-14 19:07:30 -0300
committerJesusaves <cpntb1@ymail.com>2019-09-14 19:07:30 -0300
commit9520151dde4d1849dc9d0beb367a389ed7908b17 (patch)
tree9bc74d44c8cf5b4bb405cd4657ee88cfa578de83 /localserver
parent32fd89d65b1e3635b235c4525f35e623b2ca24bd (diff)
downloadtools-9520151dde4d1849dc9d0beb367a389ed7908b17.tar.gz
tools-9520151dde4d1849dc9d0beb367a389ed7908b17.tar.bz2
tools-9520151dde4d1849dc9d0beb367a389ed7908b17.tar.xz
tools-9520151dde4d1849dc9d0beb367a389ed7908b17.zip
Force server to rollback to correct version
Diffstat (limited to 'localserver')
-rwxr-xr-xlocalserver/build.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/localserver/build.sh b/localserver/build.sh
index 011f726..90befdd 100755
--- a/localserver/build.sh
+++ b/localserver/build.sh
@@ -23,6 +23,14 @@ if [ -e "./beta.patch2" ]
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