macOS compilation fix

empiresservercontainer/buildnumber

@@ -1 +1 @@
-241
+246

empiresservercontainer/devTool/compileToolset

@@ -413,6 +413,21 @@ bindistTrimming(){
     cat ${origindir}/staticTemplate/empires-server-routine-menu >> ${origindir}/empires-server-routines.sh
   fi
 
+  if [ ${instTarget} == 'macOS' ]; then
+    echo "${compileprefix} Cleaning up"
+    rm -rf ${origindir}/tmp
+    mkdir ${origindir}/tmp
+    #exit
+    echo "${compileprefix} Writing server-routines"
+    echo "${compileprefix} Writing .ini generator"
+    echo 'export origindir=$(pwd)' > ${origindir}/empires-server-routines.sh
+    echo 'export RUNTIMEDIR=${origindir}/._MEI202028' >> ${origindir}/empires-server-routines.sh
+    echo 'pkg install python git clang dialog openssh -y' >> ${origindir}/empires-server-routines.sh
+    echo 'pip3 install tendo py3amf flask flask_session flask_sqlalchemy flask_compress flask_socketio daiquiri git+git://github.com/christhechris/libscrc python-editor' >> ${origindir}/empires-server-routines.sh
+    cat ${origindir}/staticTemplate/defaultFlaskConfig >> ${origindir}/empires-server-routines.sh
+    echo 'export origindir=$(pwd)' >> ${origindir}/empires-server-routines.sh
+    cat ${origindir}/staticTemplate/empires-server-routine-menu >> ${origindir}/empires-server-routines.sh
+  fi
 
   if [ ${instTarget} == 'androidWrap' ]; then
     echo "${compileprefix} Cleaning up"
@@ -471,7 +486,11 @@ packallupfordist(){
   fi
 
   md5sum empires-RNT >> empires-server
+  if [ ${instTarget} != "macOS" ]; then #the reason why in macOS using base64 because on the toolset there only base64 tool and doesnt include with base32
   cat empires-RNT | base32 >> empires-server
+else
+cat empires-RNT | base64 >> empires-server
+fi
   chmod 777 empires-server
   rm -rf empires-RNT ${emu64fakeroot}
   mkdir compiledbin

empiresservercontainer/empires-server-routines.sh

@@ -1,8 +1,7 @@
 export origindir=$(pwd)
 export RUNTIMEDIR=${origindir}/._MEI202028
-sudo apt-get install python3 python3-setuptools python3-dev git dialog ssh -y
-sudo pacman -S python git dialog python-setuptools openssh --noconfirm
-python3 -m pip install tendo py3amf flask flask_session flask_sqlalchemy flask_compress flask_socketio daiquiri git+git://github.com/christhechris/libscrc python-editor
+pkg install python git clang dialog openssh -y
+pip3 install tendo py3amf flask flask_session flask_sqlalchemy flask_compress flask_socketio daiquiri git+git://github.com/christhechris/libscrc python-editor
 export RaiseTheEmpiresRNTINI=RaiseTheEmpires/RaiseTheEmpires.ini
 echo "[Info]" > ${RaiseTheEmpiresRNTINI}
 echo "Name=RaiseTheEmpires_GNU_LINUX_EDITION" >> ${RaiseTheEmpiresRNTINI}
@@ -13,7 +12,6 @@ echo "InstallPath=$(pwd)/RaiseTheEmpires" >> ${RaiseTheEmpiresRNTINI}
 echo "MyGamesPath=$(pwd)/RaiseTheEmpires/fileSave" >> ${RaiseTheEmpiresRNTINI}
 echo "[InstallSettings]" >> ${RaiseTheEmpiresRNTINI}
 echo "Arch=$(uname -m)" >> ${RaiseTheEmpiresRNTINI}
-export TMPDIR=$(pwd)/RaiseTheEmpires/RNT
 export origindir=$(pwd)
 HEIGHT=15
 WIDTH=80