diff --git a/FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj b/FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj index e4f4e80c..5bbaa613 100644 --- a/FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj +++ b/FFXIVClassic Common Class Lib/FFXIVClassic Common Class Lib.csproj @@ -1,7 +1,7 @@  - - + + Debug AnyCPU @@ -82,4 +82,4 @@ --> - \ No newline at end of file + diff --git a/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj b/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj index e8d78846..5849b66b 100644 --- a/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj +++ b/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj @@ -1,7 +1,7 @@  - - + + Debug AnyCPU @@ -135,7 +135,7 @@ - copy "$(SolutionDir)data\lobby_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)" + copy "$(SolutionDir)data\lobby_config.ini" "$(SolutionDir)$(ProjectName)$(OutDir)" @@ -150,4 +150,4 @@ --> - \ No newline at end of file + diff --git a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj index 6afd806e..36bed891 100644 --- a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj +++ b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj @@ -1,7 +1,7 @@  - - + + Debug AnyCPU @@ -144,51 +144,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -206,18 +206,18 @@ - - - - - - - + + + + + + + - - - - + + + + @@ -295,7 +295,7 @@ - copy "$(SolutionDir)data\map_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)" + copy "$(SolutionDir)data\map_config.ini" "$(SolutionDir)$(ProjectName)$(OutDir)" @@ -310,4 +310,4 @@ --> - \ No newline at end of file + diff --git a/sql/import.sh b/sql/import.sh index a26f768b..93ea5e8c 100644 --- a/sql/import.sh +++ b/sql/import.sh @@ -1,25 +1,25 @@ -#!/bin/bash -IMPORT_PATH="C://coding//repositories//ffxiv related//ffxivclassic//ffxiv-classic-server//sql//" -USER=root -PASS=root -DBNAME=ffxiv_server - -ECHO Creating Database $DBNAME -mysqladmin -h localhost -u $USER -p$PASS DROP $DBNAME - -ECHO Creating Database $DBNAME -mysqladmin -h localhost -u $USER -p$PASS CREATE $DBNAME IF NOT EXISTS $DBNAME - -ECHO Loading $DBNAME tables into the database -sh cd $IMPORT_PATH - -for X in '*.sql'; -do - for Y in $X - do - echo Importing $Y; - "C:\program files\mysql\mysql server 5.7\bin\mysql" $DBNAME -h localhost -u $USER -p$PASS < $Y - done -done - -ECHO Finished! \ No newline at end of file +#!/bin/bash +IMPORT_PATH="path/to/ffxiv-classic-server/sql/" +USER=root +PASS=root +DBNAME=ffxiv_server + +echo Creating Database $DBNAME +mysql -h localhost -u $USER -p$PASS DROP $DBNAME + +echo Creating Database $DBNAME +mysql -h localhost -u $USER -p$PASS CREATE $DBNAME IF NOT EXISTS $DBNAME + +echo Loading $DBNAME tables into the database + +for X in $IMPORT_PATH'*.sql'; +do + for Y in $X + do + echo Importing $Y; + mysql $DBNAME -h localhost -u $USER -p$PASS < $Y + done +done + +echo Finished! +