From 225c4e56f5437b296f00452fd7ae76db3b8f464e Mon Sep 17 00:00:00 2001 From: bash Date: Mon, 29 Jul 2024 19:03:28 +0000 Subject: [PATCH] testing --- 5_server-configure.sh | 202 +++++++++++++++++----------------- 6_server-start.sh | 142 ++++++++++++------------ helper/clear_auctionhouse.sh | 14 +-- helper/clear_playerbots.sh | 14 +-- helper/find_characters.sh | 32 +++--- helper/git-alias.sh | 10 +- helper/merge_core.sh | 56 +++++----- helper/update_ahbot_config.sh | 48 ++++---- helper/update_realm_ip.sh | 32 +++--- helper/update_realm_name.sh | 32 +++--- sql/clear_auctionhouse.sql | 4 +- sql/clear_playerbots.sql | 60 +++++----- sql/find_character.sql | 10 +- sql/update_ahbot_config.sql | 6 +- sql/update_realm_ip.sql | 6 +- sql/update_realm_name.sql | 6 +- 16 files changed, 338 insertions(+), 336 deletions(-) diff --git a/5_server-configure.sh b/5_server-configure.sh index ee34de2..f2e5626 100755 --- a/5_server-configure.sh +++ b/5_server-configure.sh @@ -1,101 +1,101 @@ -#!/bin/bash -ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" -source ${ROOT_DIR}/variables.sh - - -read -p "This will configur the server, are you sure? (Y)es/(N)o: " -n 1 -r -echo " "; -if [[ $REPLY =~ ^[Yy]$ ]]; -then - - ########################################################################################## - # Enable mysql server - ########################################################################################## - sudo service mysql start - - - ########################################################################################## - # Create acore account - ########################################################################################## - sudo mysql -u root -e "CREATE DATABASE IF NOT EXISTS acore_auth;" - sudo mysql -u root -e "CREATE USER IF NOT EXISTS 'acore'@'%' IDENTIFIED BY 'acore';" - sudo mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'acore'@'%';" - sudo mysql -u root -e "FLUSH PRIVILEGES;" - - - ########################################################################################## - # Recompile default conf files - ########################################################################################## - sudo ${ROOT_DIR}/_server/azerothcore/acore.sh compiler configure - - - ########################################################################################## - # Ensure all folder and files are accesible for the current user - ########################################################################################## - sudo find ${ROOT_DIR}/_server/ -user root -exec sudo chown $USER: {} + - - - ########################################################################################## - # Server config merge - ########################################################################################## - sudo cat ${ROOT_DIR}/config/authserver.conf \ - ${ROOT_DIR}/_server/azerothcore/env/dist/etc/authserver.conf.dist > \ - ${ROOT_DIR}/_server/azerothcore/env/dist/etc/authserver.conf | exit 1 - - sudo cat ${ROOT_DIR}/config/worldserver.conf \ - ${ROOT_DIR}/_server/azerothcore/env/dist/etc/worldserver.conf.dist > \ - ${ROOT_DIR}/_server/azerothcore/env/dist/etc/worldserver.conf | exit 1 - - - ########################################################################################### - ## Modules config merge - ########################################################################################### - sudo cat ${ROOT_DIR}/config/modules/playerbots.conf \ - ${ROOT_DIR}/_server/azerothcore/env/dist/etc/modules/playerbots.conf.dist > \ - ${ROOT_DIR}/_server/azerothcore/env/dist/etc/modules/playerbots.conf | exit 1 - - sudo cat ${ROOT_DIR}/config/modules/mod_ahbot.conf \ - ${ROOT_DIR}/_server/azerothcore/env/dist/etc/modules/mod_ahbot.conf.dist > \ - ${ROOT_DIR}/_server/azerothcore/env/dist/etc/modules/mod_ahbot.conf | exit 1 - - - ########################################################################################## - # Set alias to start, stop and open wow or auth tmux sessions - ########################################################################################## - - if grep -R "bash_wow" ~/.bashrc - then - echo "bash_wow exists"; - else - echo " " >> ~/.bashrc - echo "if [ -f ~/.bash_wow ]; then" >> ~/.bashrc - echo " . ~/.bash_wow" >> ~/.bashrc - echo "fi" >> ~/.bashrc - fi - - echo "ROOT_DIR=${ROOT_DIR}" > ~/.bash_wow - echo "DATAPATH=${DATAPATH}" >> ~/.bash_wow - echo "alias update='${ROOT_DIR}/2_update.sh'" >> ~/.bash_wow - echo "alias build='${ROOT_DIR}/3_build.sh'" >> ~/.bash_wow - echo "alias compile='${ROOT_DIR}/4_compile.sh'" >> ~/.bash_wow - echo "alias config='${ROOT_DIR}/5_config.sh'" >> ~/.bash_wow - echo "alias start='${ROOT_DIR}/6_start.sh'" >> ~/.bash_wow - echo "alias stop='tmux kill-server'" >> ~/.bash_wow - echo "alias wow='cd ${ROOT_DIR}/_server/azerothcore;tmux attach -t ${WORLDSERVER_SESSION}'" >> ~/.bash_wow - echo "alias auth='cd ${ROOT_DIR}/_server/azerothcore;tmux attach -t ${AUTHSERVER_SESSION}'" >> ~/.bash_wow - source ~/.bashrc - echo " " - echo "###########################################################################################" - 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 - stops all sessions" - echo "### wow - logon world-server (tmux) session" - echo "### auth - logon auth-server (tmux) session" - echo "###########################################################################################" -fi +#!/bin/bash +ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" +source ${ROOT_DIR}/variables.sh + + +read -p "This will configur the server, are you sure? (Y)es/(N)o: " -n 1 -r +echo " "; +if [[ $REPLY =~ ^[Yy]$ ]]; +then + + ########################################################################################## + # Enable mysql server + ########################################################################################## + sudo service mysql start + + + ########################################################################################## + # Create acore account + ########################################################################################## + sudo mysql -u root -e "CREATE DATABASE IF NOT EXISTS acore_auth;" + sudo mysql -u root -e "CREATE USER IF NOT EXISTS 'acore'@'%' IDENTIFIED BY 'acore';" + sudo mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'acore'@'%';" + sudo mysql -u root -e "FLUSH PRIVILEGES;" + + + ########################################################################################## + # Recompile default conf files + ########################################################################################## + sudo ${ROOT_DIR}/_server/azerothcore/acore.sh compiler configure + + + ########################################################################################## + # Ensure all folder and files are accesible for the current user + ########################################################################################## + sudo find ${ROOT_DIR}/_server/ -user root -exec sudo chown $USER: {} + + + + ########################################################################################## + # Server config merge + ########################################################################################## + sudo cat ${ROOT_DIR}/config/authserver.conf \ + ${ROOT_DIR}/_server/azerothcore/env/dist/etc/authserver.conf.dist > \ + ${ROOT_DIR}/_server/azerothcore/env/dist/etc/authserver.conf | exit 1 + + sudo cat ${ROOT_DIR}/config/worldserver.conf \ + ${ROOT_DIR}/_server/azerothcore/env/dist/etc/worldserver.conf.dist > \ + ${ROOT_DIR}/_server/azerothcore/env/dist/etc/worldserver.conf | exit 1 + + + ########################################################################################### + ## Modules config merge + ########################################################################################### + sudo cat ${ROOT_DIR}/config/modules/playerbots.conf \ + ${ROOT_DIR}/_server/azerothcore/env/dist/etc/modules/playerbots.conf.dist > \ + ${ROOT_DIR}/_server/azerothcore/env/dist/etc/modules/playerbots.conf | exit 1 + + sudo cat ${ROOT_DIR}/config/modules/mod_ahbot.conf \ + ${ROOT_DIR}/_server/azerothcore/env/dist/etc/modules/mod_ahbot.conf.dist > \ + ${ROOT_DIR}/_server/azerothcore/env/dist/etc/modules/mod_ahbot.conf | exit 1 + + + ########################################################################################## + # Set alias to start, stop and open wow or auth tmux sessions + ########################################################################################## + + if grep -R "bash_wow" ~/.bashrc + then + echo "bash_wow exists"; + else + echo " " >> ~/.bashrc + echo "if [ -f ~/.bash_wow ]; then" >> ~/.bashrc + echo " . ~/.bash_wow" >> ~/.bashrc + echo "fi" >> ~/.bashrc + fi + + echo "ROOT_DIR=${ROOT_DIR}" > ~/.bash_wow + echo "DATAPATH=${DATAPATH}" >> ~/.bash_wow + echo "alias update='${ROOT_DIR}/2_update.sh'" >> ~/.bash_wow + echo "alias build='${ROOT_DIR}/3_build.sh'" >> ~/.bash_wow + echo "alias compile='${ROOT_DIR}/4_compile.sh'" >> ~/.bash_wow + echo "alias config='${ROOT_DIR}/5_config.sh'" >> ~/.bash_wow + echo "alias start='${ROOT_DIR}/6_start.sh'" >> ~/.bash_wow + echo "alias stop='tmux kill-server'" >> ~/.bash_wow + echo "alias wow='cd ${ROOT_DIR}/_server/azerothcore;tmux attach -t ${WORLDSERVER_SESSION}'" >> ~/.bash_wow + echo "alias auth='cd ${ROOT_DIR}/_server/azerothcore;tmux attach -t ${AUTHSERVER_SESSION}'" >> ~/.bash_wow + source ~/.bashrc + echo " " + echo "###########################################################################################" + 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 - stops all sessions" + echo "### wow - logon world-server (tmux) session" + echo "### auth - logon auth-server (tmux) session" + echo "###########################################################################################" +fi diff --git a/6_server-start.sh b/6_server-start.sh index 6859cf4..37c8440 100755 --- a/6_server-start.sh +++ b/6_server-start.sh @@ -1,71 +1,71 @@ -#!/bin/bash -ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" -source ${ROOT_DIR}/variables.sh - - -########################################################################################## -# Apply server realm configuration -########################################################################################## -source ${ROOT_DIR}/helper/update_realm_ip.sh ${REALM_IP} -source ${ROOT_DIR}/helper/update_realm_ip.sh ${REALM_NAME} -echo " " - - -########################################################################################## -# Apply ah-bot custom configuration -########################################################################################## -source ${ROOT_DIR}/helper/update_ahbot_config.sh ${AH_BOT_MIN_ITEMS} ${AH_BOT_MAX_ITEMS} -echo " " - - -########################################################################################## -# Clear playerbots account and characters (enforces performance and bot levels balance) -########################################################################################## -source ${ROOT_DIR}/helper/clear_playerbots.sh -echo " " - - -########################################################################################## -# handle the tmux sessions -########################################################################################## -if tmux new-session -d -s $AUTHSERVER_SESSION; then - echo "Created authserver session: $AUTHSERVER_SESSION" -else - echo "Error when trying to create authserver session: $AUTHSERVER_SESSION" -fi -echo " " - -if tmux new-session -d -s $WORLDSERVER_SESSION; then - echo "Created worldserver session: $WORLDSERVER_SESSION" -else - echo "Error when trying to create worldserver session: $WORLDSERVER_SESSION" -fi -echo " " - -if tmux send-keys -t $AUTHSERVER_SESSION "$AUTHSERVER" C-m; then - echo "Executed \"$AUTHSERVER\" inside $AUTHSERVER_SESSION" - #echo "You can attach to $AUTHSERVER_SESSION and check the result using \"tmux attach -t $AUTHSERVER_SESSION\"" -else - echo "Error when executing \"$AUTHSERVER\" inside $AUTHSERVER_SESSION" -fi -echo " " - -if tmux send-keys -t $WORLDSERVER_SESSION "$WORLDSERVER" C-m; then - echo "Executed \"$WORLDSERVER\" inside $WORLDSERVER_SESSION" - #echo "You can attach to $WORLDSERVER_SESSION and check the result using \"tmux attach -t $WORLDSERVER_SESSION\"" -else - echo "Error when executing \"$WORLDSERVER\" inside $WORLDSERVER_SESSION" -fi - -echo " " -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 - stops all sessions" -echo "### wow - logon world-server (tmux) session" -echo "### auth - logon auth-server (tmux) session" -echo "###########################################################################################" +#!/bin/bash +ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" +source ${ROOT_DIR}/variables.sh + + +########################################################################################## +# Apply server realm configuration +########################################################################################## +source ${ROOT_DIR}/helper/update_realm_ip.sh ${REALM_IP} +source ${ROOT_DIR}/helper/update_realm_ip.sh ${REALM_NAME} +echo " " + + +########################################################################################## +# Apply ah-bot custom configuration +########################################################################################## +source ${ROOT_DIR}/helper/update_ahbot_config.sh ${AH_BOT_MIN_ITEMS} ${AH_BOT_MAX_ITEMS} +echo " " + + +########################################################################################## +# Clear playerbots account and characters (enforces performance and bot levels balance) +########################################################################################## +source ${ROOT_DIR}/helper/clear_playerbots.sh +echo " " + + +########################################################################################## +# handle the tmux sessions +########################################################################################## +if tmux new-session -d -s $AUTHSERVER_SESSION; then + echo "Created authserver session: $AUTHSERVER_SESSION" +else + echo "Error when trying to create authserver session: $AUTHSERVER_SESSION" +fi +echo " " + +if tmux new-session -d -s $WORLDSERVER_SESSION; then + echo "Created worldserver session: $WORLDSERVER_SESSION" +else + echo "Error when trying to create worldserver session: $WORLDSERVER_SESSION" +fi +echo " " + +if tmux send-keys -t $AUTHSERVER_SESSION "$AUTHSERVER" C-m; then + echo "Executed \"$AUTHSERVER\" inside $AUTHSERVER_SESSION" + #echo "You can attach to $AUTHSERVER_SESSION and check the result using \"tmux attach -t $AUTHSERVER_SESSION\"" +else + echo "Error when executing \"$AUTHSERVER\" inside $AUTHSERVER_SESSION" +fi +echo " " + +if tmux send-keys -t $WORLDSERVER_SESSION "$WORLDSERVER" C-m; then + echo "Executed \"$WORLDSERVER\" inside $WORLDSERVER_SESSION" + #echo "You can attach to $WORLDSERVER_SESSION and check the result using \"tmux attach -t $WORLDSERVER_SESSION\"" +else + echo "Error when executing \"$WORLDSERVER\" inside $WORLDSERVER_SESSION" +fi + +echo " " +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 - stops all sessions" +echo "### wow - logon world-server (tmux) session" +echo "### auth - logon auth-server (tmux) session" +echo "###########################################################################################" diff --git a/helper/clear_auctionhouse.sh b/helper/clear_auctionhouse.sh index 155fd58..ba3dc72 100755 --- a/helper/clear_auctionhouse.sh +++ b/helper/clear_auctionhouse.sh @@ -1,7 +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..." +#!/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..." diff --git a/helper/clear_playerbots.sh b/helper/clear_playerbots.sh index 071aa11..1f55f32 100755 --- a/helper/clear_playerbots.sh +++ b/helper/clear_playerbots.sh @@ -1,7 +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..." +#!/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..." diff --git a/helper/find_characters.sh b/helper/find_characters.sh index 853e1c6..5ad8395 100755 --- a/helper/find_characters.sh +++ b/helper/find_characters.sh @@ -1,16 +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..." +#!/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..." diff --git a/helper/git-alias.sh b/helper/git-alias.sh index 4a378a0..4681dd1 100755 --- a/helper/git-alias.sh +++ b/helper/git-alias.sh @@ -1,5 +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' +#!/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' diff --git a/helper/merge_core.sh b/helper/merge_core.sh index 403ba40..6311f17 100755 --- a/helper/merge_core.sh +++ b/helper/merge_core.sh @@ -1,28 +1,28 @@ -#!/bin/bash -ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" - - -########################################################################################## -# General dependencies -########################################################################################## -sudo apt update && sudo apt install -y git - -read -p "Merge the orginal azerothcore code into the playerbot azerothcore, are you sure? (Y)es/(N)o: " -n 1 -r -echo " "; -if [[ $REPLY =~ ^[Yy]$ ]]; -then - ########################################################################################## - # Try to merge from the orginal azerothcore into the playerbot azerothcore fork branch - ########################################################################################## - cd ${ROOT_DIR}/../_download/azerothcore - git reset --hard origin/Playerbot - git fetch upstream - git merge upstream/master - echo " " - - echo "###########################################################################################" - echo "## If (conflict) error just run update (2_update.sh) again to restore to the latest" - echo "## version of the playerbot branch" - echo "###########################################################################################" - -fi +#!/bin/bash +ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" + + +########################################################################################## +# General dependencies +########################################################################################## +sudo apt update && sudo apt install -y git + +read -p "Merge the orginal azerothcore code into the playerbot azerothcore, are you sure? (Y)es/(N)o: " -n 1 -r +echo " "; +if [[ $REPLY =~ ^[Yy]$ ]]; +then + ########################################################################################## + # Try to merge from the orginal azerothcore into the playerbot azerothcore fork branch + ########################################################################################## + cd ${ROOT_DIR}/../_download/azerothcore + git reset --hard origin/Playerbot + git fetch upstream + git merge upstream/master + echo " " + + echo "###########################################################################################" + echo "## If (conflict) error just run update (2_update.sh) again to restore to the latest" + echo "## version of the playerbot branch" + echo "###########################################################################################" + +fi diff --git a/helper/update_ahbot_config.sh b/helper/update_ahbot_config.sh index 409bb03..218d3fe 100755 --- a/helper/update_ahbot_config.sh +++ b/helper/update_ahbot_config.sh @@ -1,24 +1,26 @@ -#!/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 - +#!/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"; + echo "Second parameter 'AH_BOT_MAX_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..." \ No newline at end of file diff --git a/helper/update_realm_ip.sh b/helper/update_realm_ip.sh index 9eb3aea..4789f76 100755 --- a/helper/update_realm_ip.sh +++ b/helper/update_realm_ip.sh @@ -1,17 +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 - +#!/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..." \ No newline at end of file diff --git a/helper/update_realm_name.sh b/helper/update_realm_name.sh index 98e0e99..5d85258 100755 --- a/helper/update_realm_name.sh +++ b/helper/update_realm_name.sh @@ -1,17 +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 - +#!/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..." \ No newline at end of file diff --git a/sql/clear_auctionhouse.sql b/sql/clear_auctionhouse.sql index 83f11f8..03ed0a3 100755 --- a/sql/clear_auctionhouse.sql +++ b/sql/clear_auctionhouse.sql @@ -1,2 +1,2 @@ -USE acore_characters; -DELETE FROM auctionhouse; +USE acore_characters; +DELETE FROM auctionhouse; diff --git a/sql/clear_playerbots.sql b/sql/clear_playerbots.sql index ee457b4..390c57f 100755 --- a/sql/clear_playerbots.sql +++ b/sql/clear_playerbots.sql @@ -1,30 +1,30 @@ -DELETE FROM `acore_playerbots`.`playerbots_random_bots`; -UPDATE `acore_characters`.`playerbots_names` SET `in_use`=0; -DELETE FROM `acore_characters`.`characters` WHERE `account` IN (SELECT `id` FROM `acore_auth`.`account` WHERE `username` LIKE 'RNDBOT%') OR `account` NOT IN (SELECT `id` FROM `acore_auth`.`account`); -DELETE FROM `acore_characters`.`character_account_data` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_achievement` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_achievement_progress` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_action` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_aura` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_glyphs` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_homebind` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`item_instance` WHERE `owner_guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_inventory` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`pet_aura` WHERE `guid` IN (SELECT `id` FROM `acore_characters`.`character_pet` WHERE `owner` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`)); -DELETE FROM `acore_characters`.`pet_spell` WHERE `guid` IN (SELECT `id` FROM `acore_characters`.`character_pet` WHERE `owner` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`)); -DELETE FROM `acore_characters`.`pet_spell_cooldown` WHERE `guid` IN (SELECT `id` FROM `acore_characters`.`character_pet` WHERE `owner` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`)); -DELETE FROM `acore_characters`.`character_pet` WHERE `owner` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_queststatus` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_queststatus_rewarded` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_reputation` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_skills` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_social` WHERE `friend` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_spell` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_spell_cooldown` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`character_talent` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`corpse` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`groups` WHERE `leaderGuid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`group_member` WHERE `memberGuid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`mail` WHERE `receiver` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_characters`.`mail_items` WHERE `receiver` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); -DELETE FROM `acore_auth`.`account` WHERE `username` LIKE 'RNDBOT%'; +DELETE FROM `acore_playerbots`.`playerbots_random_bots`; +UPDATE `acore_characters`.`playerbots_names` SET `in_use`=0; +DELETE FROM `acore_characters`.`characters` WHERE `account` IN (SELECT `id` FROM `acore_auth`.`account` WHERE `username` LIKE 'RNDBOT%') OR `account` NOT IN (SELECT `id` FROM `acore_auth`.`account`); +DELETE FROM `acore_characters`.`character_account_data` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_achievement` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_achievement_progress` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_action` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_aura` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_glyphs` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_homebind` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`item_instance` WHERE `owner_guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_inventory` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`pet_aura` WHERE `guid` IN (SELECT `id` FROM `acore_characters`.`character_pet` WHERE `owner` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`)); +DELETE FROM `acore_characters`.`pet_spell` WHERE `guid` IN (SELECT `id` FROM `acore_characters`.`character_pet` WHERE `owner` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`)); +DELETE FROM `acore_characters`.`pet_spell_cooldown` WHERE `guid` IN (SELECT `id` FROM `acore_characters`.`character_pet` WHERE `owner` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`)); +DELETE FROM `acore_characters`.`character_pet` WHERE `owner` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_queststatus` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_queststatus_rewarded` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_reputation` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_skills` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_social` WHERE `friend` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_spell` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_spell_cooldown` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`character_talent` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`corpse` WHERE `guid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`groups` WHERE `leaderGuid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`group_member` WHERE `memberGuid` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`mail` WHERE `receiver` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_characters`.`mail_items` WHERE `receiver` NOT IN (SELECT `guid` FROM `acore_characters`.`characters`); +DELETE FROM `acore_auth`.`account` WHERE `username` LIKE 'RNDBOT%'; diff --git a/sql/find_character.sql b/sql/find_character.sql index ec3f421..d0bca00 100755 --- a/sql/find_character.sql +++ b/sql/find_character.sql @@ -1,5 +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}}'; +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}}'; diff --git a/sql/update_ahbot_config.sql b/sql/update_ahbot_config.sql index 6a041e7..942e9cb 100755 --- a/sql/update_ahbot_config.sql +++ b/sql/update_ahbot_config.sql @@ -1,3 +1,3 @@ -USE acore_world; -UPDATE mod_auctionhousebot -SET minitems = '{{AH_BOT_MIN_ITEMS}}', maxitems = '{{AH_BOT_MAX_ITEMS}}'; +USE acore_world; +UPDATE mod_auctionhousebot +SET minitems = '{{AH_BOT_MIN_ITEMS}}', maxitems = '{{AH_BOT_MAX_ITEMS}}'; diff --git a/sql/update_realm_ip.sql b/sql/update_realm_ip.sql index bb391b4..5f74af4 100755 --- a/sql/update_realm_ip.sql +++ b/sql/update_realm_ip.sql @@ -1,3 +1,3 @@ -USE acore_auth; -SELECT * FROM realmlist; -UPDATE realmlist SET address='{{REALM_IP}}'; +USE acore_auth; +UPDATE realmlist +SET address='{{REALM_IP}}'; diff --git a/sql/update_realm_name.sql b/sql/update_realm_name.sql index 40ac0d1..fbb14da 100755 --- a/sql/update_realm_name.sql +++ b/sql/update_realm_name.sql @@ -1,3 +1,3 @@ -USE acore_auth; -SELECT * FROM realmlist; -UPDATE realmlist SET name='{{REALM_NAME}}'; +USE acore_auth; +UPDATE realmlist +SET name='{{REALM_NAME}}';