diff --git a/README.md b/README.md index 7bd9d34..497f512 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ - # SWG Server Star Wars: Galaxies MMORPG Server @@ -13,16 +12,16 @@ Star Wars: Galaxies MMORPG Server 8. Environment should be completely setup and built at this point ## Extra +* If you copy `config.sh.example` to `config.sh`, `build.sh` will load the settings it asks you for from it, so that you don't have to input them every time * Client content tree files can be built via `utils/build_data_tre.py` and `tools/TreeFileBuilder`, use as follows: * `python ./utils/build_data_tre.py --from ` * `./tools/TreeFileBuilder -r ` - * **Examples:** + * **Examples** * `python ./utils/build_data_tre.py 1`, to build the file list for version 1 * `./tools/TreeFileBuilder -r patch_1.rsp swgs_patch_1.tre`, to build the tree file for version 1 * `python ./utils/build_data_tre.py --from 1 2`, to build the file list for version 2 from version 1 * `./tools/TreeFileBuilder -r patch_2.rsp swgs_patch_2.tre`, to build the tree file for version 2 - ## Database Setup Oracle DB can be installed with the Atlas universal oracle preinstaller script, more information and instructions can be found [here](https://www.dizwell.com/wordpress/atlas-a-universal-oracle-preinstaller/). @@ -30,4 +29,4 @@ instructions can be found [here](https://www.dizwell.com/wordpress/atlas-a-unive wget https://bit.do/dizatlas -O atlas.sh chmod +x atlas.sh ./atlas.sh -``` +``` \ No newline at end of file diff --git a/build.sh b/build.sh index 83afa78..2528301 100755 --- a/build.sh +++ b/build.sh @@ -13,7 +13,8 @@ GIT_REPO_SITE=${GIT_URL}swg-site.git # load config for build script if [ -e "config.sh" ]; then source config.sh -else + echo "Loaded cfg variables from config.sh" +fi # Debug and Release are for testing and not public servers, they lack optimizations MODE=Release @@ -53,7 +54,7 @@ if [[ $response =~ ^(yes|y| ) ]]; then cd $basedir # DSRC - git clone -b testing $GIT_REPO_DSRC dsrc + git clone $GIT_REPO_DSRC dsrc cd $basedir/dsrc git pull cd $basedir