Merge branch 'jak1/repo-update_tools-fix' into 'master'HEADmaster

URL Fix

See merge request evolved/all!1

3 files changed, 12 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..461e166
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+client-data
+server-code
+server-data
+server-plugin
+tools
+manaplus
diff --git a/init.sh b/init.sh
index d44410e..70b0da0 100755
--- a/init.sh
+++ b/init.sh
@@ -18,7 +18,7 @@ if [[ "${CMD}" == "all" || "${CMD}" == "default" ]]; then
     ${CLONE1}/clientdata.git client-data
     ${CLONE1}/hercules.git server-code
     ${CLONE1}/serverdata.git server-data
-    ${CLONE1}/messworld-tools.git tools
+    ${CLONE1}/tools.git tools
     ${CLONE1}/evol-hercules.git server-code/src/evol
     cd server-code/src/evol ; cd ../../..
     ln -s server-code/src/evol server-plugin
@@ -27,11 +27,11 @@ elif [[ "${CMD}" == "server" ]]; then
     ${CLONE1}/serverdata.git server-data
     ${CLONE1}/evol-hercules.git server-code/src/evol
     cd server-code/src/evol ; cd ../../..
-    ${CLONE1}/messworld-tools.git tools
+    ${CLONE1}/tools.git tools
     ln -s server-code/src/evol server-plugin
 elif [[ "${CMD}" == "client" ]]; then
     ${CLONE1}/clientdata.git client-data
-    ${CLONE1}/messworld-tools.git tools
+    ${CLONE1}/tools.git tools
 #elif [[ "${CMD}" == "music" ]]; then
 #    ${CLONE1}/evol-music.git music
 elif [[ "${CMD}" == "local" ]]; then
@@ -39,10 +39,10 @@ elif [[ "${CMD}" == "local" ]]; then
     ${CLONE1}/serverdata.git server-data
     ${CLONE1}/evol-hercules.git server-code/src/evol
     cd server-code/src/evol ; cd ../../..
-    ${CLONE1}/messworld-tools.git tools
+    ${CLONE1}/tools.git tools
     ln -s server-code/src/evol server-plugin
 elif [[ "${CMD}" == "tools" ]]; then
-    ${CLONE1}/messworld-tools.git tools
+    ${CLONE1}/tools.git tools
 elif [[ "${CMD}" == "plugin" ]]; then
     ${CLONE1}/evol-hercules.git server-code/src/evol
     cd server-code/src/evol ; cd ../../..
diff --git a/install_manaplus.sh b/install_manaplus.sh
index d8b57c2..daf7d97 100755
--- a/install_manaplus.sh
+++ b/install_manaplus.sh
@@ -1,5 +1,5 @@
 sudo apt-get install -y git g++ gcc xsel make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gdb valgrind netcat-openbsd procps zlibc
-git clone https://gitlab.com/themanaworld/manaplus/manaplus.git manaplus
+git clone https://git.themanaworld.org/mana/plus.git manaplus
 cd manaplus
 autoreconf -i
 ./configure -q