Browse Source

Update to fix Windows bug

Gitea 2 years ago
parent
commit
b14df4a183
2 changed files with 33 additions and 15 deletions
  1. 33 15
      LAUNCH EQ2EMU.bat
  2. BIN
      LAUNCH EQ2EMU.rar

+ 33 - 15
LAUNCH EQ2EMU.bat

@@ -3,7 +3,7 @@ rem The following are the variables used, what they do, and the settings availab
 rem All settings on by default.
 rem SQLUPDATE Will update, the EQ2Emu World DB. 1 for on, 2 for updates only. anything else for off.
 rem ******** SETTING SQLUPDATE = 1 WILL ERASE ALL DATA IN THE DATABASE use 2 TO SAVE CHARACTERS/GUILDS ************
-rem EXEUPDATE Will update, EXE files. 1 for on, anything else for off.
+rem EXEUPDATE Will update, EXE files. 1 for on, anything else for off. If we update we check for structs as well.
 rem LUAUPDATE Will update, LUA files. 1 for on, anything else for off.
 rem MAPUPDATE Will update, MAP files. 1 for on, anything else for off.
 rem SENDBUGS  Will send your bug reports to an offsite server to be reviewed by staff. 1 for on, anything else is off.
@@ -18,6 +18,17 @@ SET MAPUPDATE=1
 SET SENDBUGS=1
 SET LSUPDATE=1
 
+rem Lets show the nice fancy header
+echo 88888888888  ,ad8888ba,     ad888888b,  88888888888  88b           d88               
+echo 88          d8"'    `"8b   d8"     "88  88           888b         d888               
+echo 88         d8'        `8b          a8P  88           88`8b       d8'88               
+echo 88aaaaa    88          88       ,d8P"   88aaaaa      88 `8b     d8' 88  88       88  
+echo 88"""""    88          88     a8P"      88"""""      88  `8b   d8'  88  88       88  
+echo 88         Y8,    "88,,8P   a8P'        88           88   `8b d8'   88  88       88  
+echo 88          Y8a.    Y88P   d8"          88           88    `888'    88  "8a,   ,a88  
+echo 88888888888  `"Y8888Y"Y8a  88888888888  88888888888  88     `8'     88   `"YbbdP'Y8  
+echo     Windows Installer by Devn00b  [Launch EQ2EMU.bat]  https://www.eq2emu.com
+
 rem Some people have older version of this script, and are missing options.bat so lets be sure they get it no matter what option is selected.
 rem On each load delete options.bat and re-download it.
 powershell write-host -fore Blue [Making sure you have an updated Options.bat]
@@ -31,8 +42,6 @@ SET FIRSTRUN=0
 if not exist options\ranonce.txt SET FIRSTRUN=1
 
 if /I "%SQLUPDATE%" EQU "1" powershell write-host -fore Red ******** SETTING SQLUPDATE = 1 WILL ERASE ALL DATA IN THE DATABASE use 2 TO SAVE CHARACTERS/GUILDS ************
-if /I "%SQLUPDATE%" EQU "1" powershell write-host -fore Red ******** Pausing for 10 seconds. If you wish to cancel press CTL-C NOW!! ************
-if /I "%SQLUPDATE%" EQU "1" timeout /t 10
 if /I "%SQLUPDATE%" EQU "1" echo [Checking for SQL Full Update and Downloading]
 if /I "%SQLUPDATE%" EQU "1" wget -q -N --no-check-certificate --show-progress --progress=bar:force:noscroll https://zeklabs.com/dl/eq2emudb.rar
 if /I "%SQLUPDATE%" EQU "1" unrar x -y -inul eq2emudb.rar
@@ -49,8 +58,8 @@ if /I "%EXEUPDATE%" EQU "1" echo [Checking for EXE Updates. **NOTE** If somethin
 if /I "%EXEUPDATE%" EQU "1" cd server
 if /I "%EXEUPDATE%" EQU "1" mkdir oldfiles
 if /I "%EXEUPDATE%" EQU "1" move eq2*.exe oldfiles
-if /I "%EXEUPDATE%" EQU "1" wget -q http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2Login__Debug64.exe
-if /I "%EXEUPDATE%" EQU "1" wget -q http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2World__Debug_x64.exe
+if /I "%EXEUPDATE%" EQU "1" wget -q http://git.eq2emu.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2Login__Debug64.exe
+if /I "%EXEUPDATE%" EQU "1" wget -q http://git.eq2emu.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2World__Debug_x64.exe
 if /I "%EXEUPDATE%" EQU "1" echo [New EXE Could Mean NEW Structs. Checking...]
 if /I "%EXEUPDATE%" EQU "1" move SpawnStructs.xml oldfiles/
 if /I "%EXEUPDATE%" EQU "1" move WorldStructs.xml oldfiles/
@@ -58,12 +67,12 @@ if /I "%EXEUPDATE%" EQU "1" move EQ2_Structs.xml oldfiles/
 if /I "%EXEUPDATE%" EQU "1" move ItemStructs.xml oldfiles/
 if /I "%EXEUPDATE%" EQU "1" move LoginStructs.xml oldfiles/
 if /I "%EXEUPDATE%" EQU "1" move CommonStructs.xml oldfiles/
-if /I "%EXEUPDATE%" EQU "1" wget -q http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/SpawnStructs.xml
-if /I "%EXEUPDATE%" EQU "1" wget -q http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/WorldStructs.xml
-if /I "%EXEUPDATE%" EQU "1" wget -q http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2_Structs.xml
-if /I "%EXEUPDATE%" EQU "1" wget -q http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/ItemStructs.xml
-if /I "%EXEUPDATE%" EQU "1" wget -q http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/LoginStructs.xml
-if /I "%EXEUPDATE%" EQU "1" wget -q http://cutpon.com:3000/devn00b/EQ2EMu/raw/master/server/CommonStructs.xml
+if /I "%EXEUPDATE%" EQU "1" wget -q http://git.eq2emu.com:3000/devn00b/EQ2EMu/raw/master/server/SpawnStructs.xml
+if /I "%EXEUPDATE%" EQU "1" wget -q http://git.eq2emu.com:3000/devn00b/EQ2EMu/raw/master/server/WorldStructs.xml
+if /I "%EXEUPDATE%" EQU "1" wget -q http://git.eq2emu.com:3000/devn00b/EQ2EMu/raw/master/server/EQ2_Structs.xml
+if /I "%EXEUPDATE%" EQU "1" wget -q http://git.eq2emu.com:3000/devn00b/EQ2EMu/raw/master/server/ItemStructs.xml
+if /I "%EXEUPDATE%" EQU "1" wget -q http://git.eq2emu.com:3000/devn00b/EQ2EMu/raw/master/server/LoginStructs.xml
+if /I "%EXEUPDATE%" EQU "1" wget -q http://git.eq2emu.com:3000/devn00b/EQ2EMu/raw/master/server/CommonStructs.xml
 if /I "%EXEUPDATE%" EQU "1" echo [Completed Struct Updates]
 if /I "%EXEUPDATE%" EQU "1" echo [Completed EXE Updates]
 if /I "%EXEUPDATE%" EQU "1" cd ..
@@ -112,16 +121,17 @@ if /I "%MAPUPDATE%" EQU "1" echo [Completed MAP Updates]
 if /I "%MAPUPDATE%" EQU "1" cd ..
 
 echo [Loading MariaDB]
-if /I "%FIRSTRUN%" EQU "1" wget -q --no-check-certificate https://www.zeklabs.com/dl/startdb.bat
-start startdb.bat
+cd mariadb\bin
+start db.bat
 echo [You Can Press Any Key To Continue Once MYSQL has Completed Loading]
 timeout /t 60
 echo [MariaDB Loaded]
+cd ..\..
 
 if /I "%LSUPDATE%" EQU "1" echo [Updating LoginServer SQL]
 if /I "%LSUPDATE%" EQU "1" cd server
 if /I "%LSUPDATE%" EQU "1" mkdir oldfiles
-if /I "%LSUPDATE%" EQU "1" echo [Saving Character and World Data before Import]
+if /I "%LSUPDATE%" EQU "1" echo [Saving Character and WorldServer Data before Import]
 if /I "%LSUPDATE%" EQU "1" ..\mariadb\bin\mysqldump -ueq2emu -peq2emu eq2ls login_characters > lschars.sql
 if /I "%LSUPDATE%" EQU "1" ..\mariadb\bin\mysqldump -ueq2emu -peq2emu eq2ls login_worldservers >> lschars.sql
 if /I "%LSUPDATE%" EQU "1" ..\wget -q -N --no-check-certificate https://zeklabs.com/dl/eq2emulssql.rar
@@ -176,8 +186,16 @@ if /I "%FIRSTRUN%" EQU "1" cd ..\..
 if /I "%FIRSTRUN%" EQU "1" echo [Starter Account Inserted. Username: eq2emu Password: eq2emu Character: Eqtwoemu]
 if /I "%FIRSTRUN%" EQU "1" echo [Starter Account Inserted. Username: eq2emu Password: eq2emu Character: Eqtwoemu] > options\ranonce.txt
 
+if /I "%FIRSTRUN%" EQU "1" echo [Fixing Windows Bug With Hostname]
+if /I "%FIRSTRUN%" EQU "1" cd server
+if /I "%FIRSTRUN%" EQU "1" ..\wget -q --no-check-certificate https://www.zeklabs.com/dl/fart.exe
+if /I "%FIRSTRUN%" EQU "1" FOR /F "usebackq" %%i IN (`hostname`) DO SET HOSTNAME=%%i
+if /I "%FIRSTRUN%" EQU "1" fart loginserver.ini 127.0.0.1 %HOSTNAME%
+if /I "%FIRSTRUN%" EQU "1" echo [Hostname Should now be %HOSTNAME%]
+if /I "%FIRSTRUN%" EQU "1" cd ..
+
 echo [Starting World And Login]
 start srvls.bat
 start srvwrld.bat
 
-exit
+exit

BIN
LAUNCH EQ2EMU.rar