Skip to content

Commit

Permalink
Update .gitignore and sql_import.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
mordred committed Dec 13, 2018
1 parent ea64b65 commit 726c122
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
16 changes: 5 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# Output Directory
[Bb]in/*.exe
[Bb]in/*.pdb
[Bb]in/sapphire_api
[Bb]in/sapphire_zone
[Bb]in/sapphire_lobby
[Bb]in/sapphire_dbm


[Bb]in/api
[Bb]in/zone
[Bb]in/lobby
[Bb]in/dbm

# Script Directory
# TODO: Sperate script directory from bin
Expand Down Expand Up @@ -71,10 +69,6 @@ CTestTestfile.cmake
# Binary Template
*.bt

# Boost
/lib/boost_1_63_0
src/libraries/external/boost_*

# EasyHook
!EasyHook32.dll
!EasyHook32Svc.exe
Expand Down Expand Up @@ -120,7 +114,7 @@ src/common/Version\.cpp
.mtime_cache

# generated script loader files
src/servers/Scripts/*/ScriptLoader.cpp
src/scripts/*/ScriptLoader.cpp

# cotire generated files/folders
cotire/
Expand Down
4 changes: 2 additions & 2 deletions sql_import.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
cd bin
./sapphire_dbm --mode initialize --user root --database sapphire --sfile sql/schema/schema.sql --ifile sql/schema/inserts.sql
./sapphire_dbm --mode liquidate --user root --database sapphire --force
./dbm --mode initialize --user root --database sapphire --sfile sql/schema/schema.sql --ifile sql/schema/inserts.sql
./dbm --mode liquidate --user root --database sapphire --force
cd ..

0 comments on commit 726c122

Please sign in to comment.