summaryrefslogtreecommitdiff
path: root/localserver/updater.sh
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-09-14 19:13:21 -0300
committerJesusaves <cpntb1@ymail.com>2019-09-14 19:13:21 -0300
commit21802a6ce930a12119f3db240b1d00d5abb1e200 (patch)
tree0764f57d4ba00c08d7295ea34c62605c2dd93265 /localserver/updater.sh
parent9520151dde4d1849dc9d0beb367a389ed7908b17 (diff)
downloadtools-21802a6ce930a12119f3db240b1d00d5abb1e200.tar.gz
tools-21802a6ce930a12119f3db240b1d00d5abb1e200.tar.bz2
tools-21802a6ce930a12119f3db240b1d00d5abb1e200.tar.xz
tools-21802a6ce930a12119f3db240b1d00d5abb1e200.zip
Split build chain in another file (updater.sh) so buildasan.sh still works
Diffstat (limited to 'localserver/updater.sh')
-rwxr-xr-xlocalserver/updater.sh44
1 files changed, 44 insertions, 0 deletions
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
+