testing

2_source-update.sh

@@ -8,6 +8,10 @@ echo " ";
 if [[ $REPLY =~ ^[Yy]$ ]];
 then
 
+	sudo chmod +x ${ROOT_DIR}/*.sh
+	sudo chmod +x ${ROOT_DIR}/helper/*.sh
+
+
     ##########################################################################################
     # General dependencies
     ##########################################################################################

5_server-configure.sh

@@ -89,13 +89,13 @@ then
     echo "## After the first install or changes either reboot or TYPE! 'source ~/.bashrc'"
     echo "###########################################################################################"
     echo "## After the above you can use the following commands:"
+    echo "### update  -  Updates source-code to latest version"
+    echo "### build   -  Builds the server based on source-code"
+    echo "### compile -  Compiles the code based on the build server"
+    echo "### config  -  Applies the server configration"
     echo "### start   -  starts auth and world in tmux sessions server"
-    echo "### stop    -  starts all servers"
+    echo "### stop    -  stops all sessions"
-    echo "### wow     -  logon world-server tmux session"
+    echo "### wow     -  logon world-server (tmux) session"
-    echo "### auth    -  logon auth-server tmux session"
+    echo "### auth    -  logon auth-server (tmux) session"
-    echo "### update  -  updates the current downloaded source-code, after rerun: build, compile and config."
-    echo "### build   -  (re)builds the server based on the downloaded/updated source-codes"
-    echo "### compile -  (re)compiles the server based on the build server"
-    echo "### config  -  applies configuration settings defined in the 'config' folder"
     echo "###########################################################################################"
 fi

6_server-start.sh

@@ -4,27 +4,24 @@ source ${ROOT_DIR}/variables.sh
 
 
 ##########################################################################################
-# Apply realm settings
+# Apply server realm configuration
 ##########################################################################################
-sudo mysql -u root --database="acore_auth" -e "UPDATE realmlist SET address = '${REALM_IP}' WHERE id = 1;"
+source ${ROOT_DIR}/helper/update_realm_ip.sh ${REALM_IP}
-sudo mysql -u root --database="acore_auth" -e "UPDATE realmlist SET name = '${REALM_NAME}' WHERE id = 1;"
+source ${ROOT_DIR}/helper/update_realm_ip.sh ${REALM_NAME}
-echo "Realm settings updated..."
 echo " "
 
 
 ##########################################################################################
-# Apply ah-modbot settings
+# Apply ah-bot custom configuration
 ##########################################################################################
-sudo mysql -u root --database="acore_world" -e "UPDATE mod_auctionhousebot SET minitems = ${AH_BOT_MIN_ITEMS}, maxitems = ${AH_BOT_MAX_ITEMS};"
+source ${ROOT_DIR}/helper/update_ahbot_config.sh ${AH_BOT_MIN_ITEMS} ${AH_BOT_MAX_ITEMS}
-echo "Module ah-modbot updated..."
 echo " "
 
 
 ##########################################################################################
-# reset playerbots data (enforces performance and bot levels balance)
+# Clear playerbots account and characters (enforces performance and bot levels balance)
 ##########################################################################################
-sudo mysql -u root --database="acore_characters" < ${ROOT_DIR}/lib/clear-bots.sql
+source ${ROOT_DIR}/helper/clear_playerbots.sh
-echo "Module playerbots updated..."
 echo " "
 
 
@@ -59,13 +56,16 @@ if tmux send-keys -t $WORLDSERVER_SESSION "$WORLDSERVER" C-m; then
 else
     echo "Error when executing \"$WORLDSERVER\" inside $WORLDSERVER_SESSION"
 fi
-echo " "
 
+echo " "
 echo "###########################################################################################"
-echo "# type in terminal: "
+echo "## After the above you can use the following commands:"
-echo "#   - 'wow'            : for the worlds-server session"
+echo "### update  -  Updates source-code to latest version"
-echo "#   - 'auth'           : for the auth-server session"
+echo "### build   -  Builds the server based on source-code"
-echo "#   - 'ctrl+b then d'  : detach from session (if not working use ctrl-z)"
+echo "### compile -  Compiles the code based on the build server"
-echo "#   - 'stop'           : the kill the world and auth -server sessions"
+echo "### config  -  Applies the server configration"
-echo "#   - 'update'         :   
+echo "### start   -  starts auth and world in tmux sessions server"
+echo "### stop    -  stops all sessions"
+echo "### wow     -  logon world-server (tmux) session"
+echo "### auth    -  logon auth-server (tmux) session"
 echo "###########################################################################################"

helper/clear-ah.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-read -p "This will delete all items of the auction house, are you sure? (Y)es/(N)o: " -n 1 -r
-echo " ";
-if [[ $REPLY =~ ^[Yy]$ ]];
-then
-
-    sudo mysql -u root --database="acore_characters" -e "DELETE FROM auctionhouse;"
-
-fi
-

helper/clear_auctionhouse.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"/..
+source ${ROOT_DIR}/variables.sh
+
+sudo mysql -u root --database="acore_characters" < ${ROOT_DIR}/sql/clear_auctionhouse.sql
+
+echo "Auction house items deleted..."

helper/clear_playerbots.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"/..
+source ${ROOT_DIR}/variables.sh
+
+sudo mysql -u root --database="acore_characters" < ${ROOT_DIR}/sql/clear_playerbots.sql
+
+echo "Playerbots accounts and characters deleted..."

helper/find-character.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [ -z "$1" ]
-then
- echo "Parameter is null, first paramter 'character name' should not be empty";
- exit 1;
-fi
-
-# find character and account id by name, mainly used for configuring the ah-bot mod.
-sudo mysql -u root --database="acore_auth" -e "select acc.id as accountId, ch.guid as characterId from acore_auth.account as acc inner join acore_characters.characters as ch where acc.id = ch.account and acc.username = '${1}';"

helper/find_characters.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"/..
+source ${ROOT_DIR}/variables.sh
+
+ACCOUNT_NAME=$1;
+if [ -z "$ACCOUNT_NAME" ]
+then
+ echo "First parameter 'ACCOUNT_NAME' is required";
+ exit 1;
+fi
+
+sed -e "s/{{ACCOUNT_NAME}}/$ACCOUNT_NAME/g" \
+  "${ROOT_DIR}/sql/find_character.sql" > "/tmp/find_character.sql"
+sudo mysql -u root --database="acore_characters" < /tmp/find_character.sql
+
+echo "Find character executed..."

helper/git-alias.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Alias GIT (git lg for git commits, git ls for commits with changed files)
+git config --global alias.lg 'log --graph --abbrev-commit --decorate --date=relative --all'
+git config --global alias.ls 'log --stat --pretty=short --graph'

helper/update_ahbot_config.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"/..
+source ${ROOT_DIR}/variables.sh
+
+AH_BOT_MIN_ITEMS=$1;
+if [ -z "$AH_BOT_MIN_ITEMS" ]
+then
+ echo "First parameter 'AH_BOT_MIN_ITEMS' is required";
+ exit 1;
+fi
+AH_BOT_MAX_ITEMS=$2
+if [ -z "$AH_BOT_MAX_ITEMS" ]
+then
+ echo "Second parameter 'AH_BOT_MAX_ITEMS' is required";
+ exit 1;
+fi
+
+
+sed -e "s/{{AH_BOT_MIN_ITEMS}}/$AH_BOT_MIN_ITEMS/g" \
+    -e "s/{{AH_BOT_MAX_ITEMS}}/$AH_BOT_MAX_ITEMS/g" \
+    > "${ROOT_DIR}/sql/update_ahbot_config.sql" > "/tmp/update_ahbot_config.sql"
+sudo mysql -u root --database="acore_characters" < /tmp/update_ahbot_config.sql
+
+echo "AH-bot config updated..."

helper/update_realm_ip.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"/..
+source ${ROOT_DIR}/variables.sh
+
+REALM_IP=$1;
+if [ -z "$REALM_IP" ]
+then
+ echo "First parameter 'REALM_IP' is required";
+ exit 1;
+fi
+
+
+sed -e "s/{{REALM_IP}}/$REALM_IP/g" \
+    "${ROOT_DIR}/sql/update_realm_ip.sql" > "/tmp/update_realm_ip.sql"
+sudo mysql -u root --database="acore_characters" < /tmp/update_realm_ip.sql
+
+echo "Server realm IP updated..."

helper/update_realm_name.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"/..
+source ${ROOT_DIR}/variables.sh
+
+REALM_NAME=$1;
+if [ -z "$REALM_NAME" ]
+then
+ echo "First parameter 'REALM_NAME' is required";
+ exit 1;
+fi
+
+
+sed -e "s/{{REALM_NAME}}/$REALM_NAME/g" \
+    "${ROOT_DIR}/sql/update_realm_name.sql" > "/tmp/update_realm_name.sql"
+sudo mysql -u root --database="acore_characters" < /tmp/update_realm_name.sql
+
+echo "Server realm name updated..."

lib/general-settings.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-##########################################################################################
-# General settings
-##########################################################################################
-# Setting execute rights for the scripts
-sudo chmod +x ${ROOT_DIR}/*.sh
-sudo chmod +x ${ROOT_DIR}/lib/*.sh
-sudo chmod +x ${ROOT_DIR}/helper/*.sh
-
-# Alias GIT (git lg for git commits, git ls for commits with changed files)
-git config --global alias.lg 'log --graph --abbrev-commit --decorate --date=relative --all'
-git config --global alias.ls 'log --stat --pretty=short --graph'

sql/clear_auctionhouse.sql

@@ -0,0 +1,2 @@
+USE acore_characters;
+DELETE FROM auctionhouse;

sql/find_character.sql

@@ -0,0 +1,5 @@
+USE acore_auth;
+SELECT acc.id AS accountId, ch.name as characterName, ch.guid AS characterId,  
+FROM acore_auth.account AS acc 
+INNER JOIN acore_characters.characters AS ch 
+WHERE acc.id = ch.account and acc.username = '{{ACCOUNT_NAME}}';

sql/update_ahbot_config.sql

@@ -1,3 +1,3 @@
 USE acore_world;
 UPDATE mod_auctionhousebot
-SET minitems = 30000, maxitems = 40000;
+SET minitems = '{{AH_BOT_MIN_ITEMS}}', maxitems = '{{AH_BOT_MAX_ITEMS}}';

sql/update_realm_ip.sql

@@ -1,3 +1,3 @@
 USE acore_auth;
 SELECT * FROM realmlist;
-UPDATE realmlist SET address='192.168.178.185';
+UPDATE realmlist SET address='{{REALM_IP}}';

sql/update_realm_name.sql

@@ -1,3 +1,3 @@
 USE acore_auth;
 SELECT * FROM realmlist;
-UPDATE realmlist SET name='azerothcore.org';
+UPDATE realmlist SET name='{{REALM_NAME}}';

variables.sh

@@ -34,9 +34,3 @@ REALM_NAME="azerothcore.org"
 
 AH_BOT_MIN_ITEMS=25000
 AH_BOT_MAX_ITEMS=30000
-
-
-##########################################################################################
-# General settings
-##########################################################################################
-source ${ROOT_DIR}/lib/general-settings.sh