summaryrefslogtreecommitdiff
path: root/.tools/scripts/init.sh
diff options
context:
space:
mode:
Diffstat (limited to '.tools/scripts/init.sh')
-rwxr-xr-x.tools/scripts/init.sh10
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..."