From b427d1be755596743e7146b4616f321c1d348190 Mon Sep 17 00:00:00 2001
From: AleaJactaEst <jean.sorgemoel.liber@free.fr>
Date: Thu, 26 Jul 2018 09:36:10 +0200
Subject: [PATCH] change method to load environment

---
 .gitlab-ci.yml | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03fa89b..28ba022 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,17 +60,17 @@ Linux server build:
     - /opt/servercontainer_init_mysql.sh
     - /opt/servercontainer_init_apache.sh
     - /opt/servercontainer_init_configure_envi.sh
-#    - source /home/gameserver/.bashrc # doesn't work, why ?
-    - export -p KHANAT_HOME=/home/gameserver
-    - export -p KHANAT_PATH=/home/gameserver/khanat
-    - export -p PATH=$PATH:/usr/local/bin
-    - export -p PATCH_CLIENT_SYSTEM=$KHANAT_HOME/khanat/patch_service
-    - export -p DIRCLIENT="Khanat_Linux64"
-    - export -p PACKAGECLIENT="smokey_linux64"
-    - export -p PREPARE_CLIENT_DIR="khanat/prepare_client/$DIRCLIENT"
-    - export -p CLIENT_DIR="khanat/client_service"
-    - export -p HOME_PREPARE_CLIENT="$KHANAT_HOME/$PREPARE_CLIENT_DIR"
-    - export -p HOME_CLIENT="$KHANAT_HOME/$CLIENT_DIR"
+    - source /home/gameserver/.bashrc
+#    - export -p KHANAT_HOME=/home/gameserver
+#    - export -p KHANAT_PATH=/home/gameserver/khanat
+#    - export -p PATH=$PATH:/usr/local/bin
+#    - export -p PATCH_CLIENT_SYSTEM=$KHANAT_HOME/khanat/patch_service
+#    - export -p DIRCLIENT="Khanat_Linux64"
+#    - export -p PACKAGECLIENT="smokey_linux64"
+#    - export -p PREPARE_CLIENT_DIR="khanat/prepare_client/$DIRCLIENT"
+#    - export -p CLIENT_DIR="khanat/client_service"
+#    - export -p HOME_PREPARE_CLIENT="$KHANAT_HOME/$PREPARE_CLIENT_DIR"
+#    - export -p HOME_CLIENT="$KHANAT_HOME/$CLIENT_DIR"
     - echo "KHANAT_PATH $KHANAT_PATH"
     - mkdir -p $KHANAT_PATH 
     - mkdir -p /home/gameserver/ext
@@ -83,14 +83,6 @@ Linux server build:
     - for file in /opt/artefacts/code/build/bin/* ; do ln -s $file /usr/local/bin ; done
     - for file in /opt/artefacts/code/build/lib/* ; do ln -s $file /usr/local/lib ; done
     - ldconfig
-    #- /opt/ext/servercontainer_configure_link.sh
-    #- /opt/ext/servercontainer_configure_mysql.sh
-    #- /opt/ext/servercontainer_configure_apache.sh
-    #- /opt/ext/servercontainer_configure_world.sh
-    #- su -c '/opt/ext/servercontainer_configure_khanat.sh' gameserver
-    #- su -c '/opt/ext/servercontainer_configure_patch.sh' gameserver
-    #- su -c '/opt/ext/servercontainer_configure_launcher.sh' gameserver
-    #- su -c 'touch /home/gameserver/khanat/step_configure.ok' gameserver
     - /opt/ext/servercontainer_configure_auto.sh
     - /opt/ext/servercontainer_update_auto.sh
     # Clean