From 031dac6f4e464969619fb6301946cb12ddbabb71 Mon Sep 17 00:00:00 2001
From: AleaJactaEst <jean.sorgemoel.liber@free.fr>
Date: Mon, 9 Jul 2018 22:00:05 +0200
Subject: [PATCH] correct package client generated on 64bit

---
 .gitlab-ci.yml                                          | 6 +++---
 server/debian/common/servercontainer_configure_patch.sh | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cafd3c..2bad051 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,9 +54,9 @@ Linux server build:
     - cp $WORKDIR/server/debian/common/khaganat.cfg /opt/ext
     - mkdir -p /opt/rootweb
     - cp $WORKDIR/server/common/rootweb/* /opt/rootweb/
-    - echo -e 'export KHANAT_CLIENT_VERSION="1"\nexport UIDGAMESERVER=1000\nexport GIDGAMESERVER=1000\nexport DIRCLIENT="/opt/opennel_data"\nexport PACKAGECLIENT="smokey_linux64"' > /opt/khanat_config.sh
-    - /opt/servercontainer_init_create_account.sh
+    - echo -e 'export KHANAT_CLIENT_VERSION="1"\nexport UIDGAMESERVER=1000\nexport GIDGAMESERVER=1000\nexport DIRCLIENT="Khanat_Linux64"\nexport PACKAGECLIENT="smokey_linux64"' > /opt/khanat_config.sh
     - mkdir -p /var/run/mysqld
+    - /opt/servercontainer_init_create_account.sh
     - /opt/servercontainer_init_mysql.sh
     - /opt/servercontainer_init_apache.sh
     - /opt/servercontainer_init_configure_envi.sh
@@ -65,7 +65,7 @@ Linux server build:
     - 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="/opt/opennel_data"
+    - 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"
diff --git a/server/debian/common/servercontainer_configure_patch.sh b/server/debian/common/servercontainer_configure_patch.sh
index 9ba74a1..4e4f2ad 100755
--- a/server/debian/common/servercontainer_configure_patch.sh
+++ b/server/debian/common/servercontainer_configure_patch.sh
@@ -50,6 +50,10 @@ do
          set_debug 1
          shift
          ;;
+      --client-dir=*)
+        DIRCLIENT="${1#*=}"
+        shift
+        ;;
       *)
          msg_error "[$(basename $0):$LINENO] options '$1' not recognize"
          usage