From e928dbacb45ca7e2982243a4f468182db59a6826 Mon Sep 17 00:00:00 2001
From: andy5995 <andy400-dev@yahoo.com>
Date: Wed, 17 Jan 2018 20:43:17 -0600
Subject: [PATCH] cleanup after removing submodules [skip ci]

---
 .gitignore             |  3 +++
 .gitmodules            |  0
 README.md              |  4 +++-
 data/glest_game        |  1 -
 git_update.sh          | 16 ++++++++++++++++
 mk/linux/git_update.sh | 28 ----------------------------
 mk/linux/glest-dev.ini |  2 +-
 source/masterserver    |  1 -
 8 files changed, 23 insertions(+), 32 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 data/glest_game
 create mode 100755 git_update.sh
 delete mode 100755 mk/linux/git_update.sh
 delete mode 160000 source/masterserver

diff --git a/.gitignore b/.gitignore
index cbab25ea0..c89e4ae23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,6 @@ $RECYCLE.BIN/
 /mk/linux/zetaglest
 /mk/linux/zetaglest_editor
 /mk/linux/zetaglest_g3dviewer
+data
+source/masterserver
+mk/linux/tools-for-standalone-client/installer/mojosetup
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29bb..000000000
diff --git a/README.md b/README.md
index 19635d34f..919d0ea7a 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,9 @@ libwxgtk3.0-dev libxml2-dev
 
 Use this command:
 
-    git clone --recursive https://github.com/ZetaGlest/zetaglest-source.git
+    git clone https://github.com/ZetaGlest/zetaglest-source.git zetaglest
+    cd zetaglest
+    git clone https://github.com/ZetaGlest/zetaglest-data.git data
 
 Afterward, to build, change to the mk/ directory, select your operating
 system and run
diff --git a/data/glest_game b/data/glest_game
deleted file mode 160000
index 46430e3b1..000000000
--- a/data/glest_game
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 46430e3b13e5aac3a87a19735938e0579f29898b
diff --git a/git_update.sh b/git_update.sh
new file mode 100755
index 000000000..3e63a3152
--- /dev/null
+++ b/git_update.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+export LANG=C
+
+cd "$(dirname $(readlink -f $0))"
+
+cd git pull &&
+
+cd data &&
+git pull &&
+
+cd source/masterserver &&
+git pull &&
+
+cd mk/linux/tools-for-standalone-client/installer/mojosetup
+git pull
+
diff --git a/mk/linux/git_update.sh b/mk/linux/git_update.sh
deleted file mode 100755
index e2807fc74..000000000
--- a/mk/linux/git_update.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-export LANG=C 
-
-cd "$(dirname $(readlink -f $0))"
-
-echo "STAGE 1/3 - GIT PULL"
-echo
-echo "Entering '../..'"
-git pull
-echo
-git submodule foreach 'git pull; echo'
-
-echo
-echo
-echo "STAGE 2/3 - GIT BRANCH"
-echo
-echo "Entering '../..'"
-git branch
-echo
-git submodule foreach 'git branch; echo'
-
-echo
-echo "STAGE 3/3 - GIT STATUS"
-echo
-echo "Entering '../..'"
-git status
-echo
-git submodule foreach 'git status; echo'
diff --git a/mk/linux/glest-dev.ini b/mk/linux/glest-dev.ini
index c2c91931e..fd4459f17 100644
--- a/mk/linux/glest-dev.ini
+++ b/mk/linux/glest-dev.ini
@@ -1,3 +1,3 @@
-DataPath=$APPLICATIONPATH/../../data/glest_game/
+DataPath=$APPLICATIONPATH/../data/glest_game/
 ServerListPath=$APPLICATIONPATH/../shared/
 GlestKeysIniPath=$APPLICATIONPATH/../shared/
diff --git a/source/masterserver b/source/masterserver
deleted file mode 160000
index c8717d3a5..000000000
--- a/source/masterserver
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c8717d3a5df60f623b454de020090cfededde149