From 597610cbc605ea018998441dad41dc48ba1b4174 Mon Sep 17 00:00:00 2001 From: Warkdev Date: Tue, 13 Sep 2016 20:29:46 +0200 Subject: [PATCH 1/4] Updating lazymangos.sh script to handle database configuration and auto-setup of configuration files. --- linux/lazymangos.sh | 65 +++++++++++++++++++++++++++++++++++++++------ src/modules/SD3 | 2 +- 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/linux/lazymangos.sh b/linux/lazymangos.sh index 68457499..ef6b38c9 100755 --- a/linux/lazymangos.sh +++ b/linux/lazymangos.sh @@ -151,8 +151,8 @@ choose_modules() mysql_setup() { - if [ -f "~/database/InstallDatabases.sh" ]; then - sudo su - $user -c "cd ~/database; ./InstallDatabases.sh -s" + if [ -f "/home/${user}/database/InstallDatabases.sh" ]; then + sudo su - $user -c "cd /home/${user}/database; ./InstallDatabases.sh -s -d" else echo -e "Database configuration SKIPPED - Cannot find the script to setup the database" fi @@ -303,9 +303,33 @@ mangos_install() " >> /home/$user/Lazy-README chown -R $user:$user /home/$user/* su -c "chmod +x /home/$user/zero/*.sh" -s /bin/bash $user - su -c "mv /home/$user/zero/etc/realmd.conf.dist /home/$user/zero/etc/realmd.conf" -s /bin/bash $user - su -c "mv /home/$user/zero/etc/mangosd.conf.dist /home/$user/zero/etc/mangosd.conf" -s /bin/bash $user - su -c "mv /home/$user/zero/etc/ahbot.conf.dist /home/$user/zero/etc/ahbot.conf" -s /bin/bash $user + + if [ -f /home/${user}/db.conf ]; then + realmdb=$(head -1 /home/${user}/db.conf | tail -1) + mangosdb=$(head -2 /home/${user}/db.conf | tail -1) + chardb=$(head -3 /home/${user}/db.conf | tail -1) + + if [ -f /home/${user}/zero/etc/mangosd.conf.dist ]; then + sed 's/LoginDatabaseInfo.*/LoginDatabaseInfo\t = '"\"${realmdb}\""'/g' /home/${user}/zero/etc/mangosd.conf.dist > /home/${user}/zero/etc/mangosd.conf + sed 's/WorldDatabaseInfo.*/WorldDatabaseInfo\t = '"\"${mangosdb}\""'/g' /home/${user}/zero/etc/mangosd.conf > /home/${user}/zero/etc/mangosd.conf.dist + sed 's/CharacterDatabaseInfo.*/CharacterDatabaseInfo\t = '"\"${chardb}\""'/g' /home/${user}/zero/etc/mangosd.conf.dist > /home/${user}/zero/etc/mangosd.conf + rm -rf /home/${user}/zero/etc/mangos.conf.dist + fi + + if [ -f /home/${user}/zero/etc/realmd.conf.dist ]; then + sed 's/LoginDatabaseInfo.*/LoginDatabaseInfo\t = '"\"${realmdb}\""'/g' /home/${user}/zero/etc/realmd.conf.dist > /home/${user}/zero/etc/realmd.conf + rm -rf /home/${user}/zero/etc/realmd.conf.dist + fi + chown ${user}:${user} /home/${user}/zero/etc/mangosd.conf + chown ${user}:${user} /home/${user}/zero/etc/realmd.conf + rm -rf /home/${user}/db.conf + else + su -c "mv /home/$user/zero/etc/mangosd.conf.dist /home/$user/zero/etc/mangosd.conf" -s /bin/bash $user + su -c "mv /home/$user/zero/etc/realmd.conf.dist /home/$user/zero/etc/realmd.conf" -s /bin/bash $user + fi + + su -c "mv /home/$user/zero/etc/ahbot.conf.dist /home/$user/zero/etc/ahbot.conf" -s /bin/bash $user + echo -e "" echo -e "${BWhi}-------------------------" echo -e "${BGre}Auto Restart Scripts" @@ -455,9 +479,34 @@ mangos_install() " >> /home/$user/Lazy-README chown -R $user:$user /home/$user/* su -c "chmod +x /home/$user/one/*.sh" -s /bin/bash $user - su -c "mv /home/$user/one/etc/realmd.conf.dist /home/$user/one/etc/realmd.conf" -s /bin/bash $user - su -c "mv /home/$user/one/etc/mangosd.conf.dist /home/$user/one/etc/mangosd.conf" -s /bin/bash $user - su -c "mv /home/$user/one/etc/ahbot.conf.dist /home/$user/one/etc/ahbot.conf" -s /bin/bash $user + + if [ -f /home/${user}/db.conf ]; then + realmdb=$(head -1 /home/${user}/db.conf | tail -1) + mangosdb=$(head -2 /home/${user}/db.conf | tail -1) + chardb=$(head -3 /home/${user}/db.conf | tail -1) + + if [ -f /home/${user}/one/etc/mangosd.conf.dist ]; then + sed 's/LoginDatabaseInfo.*/LoginDatabaseInfo\t = '"\"${realmdb}\""'/g' /home/${user}/one/etc/mangosd.conf.dist > /home/${user}/one/etc/mangosd.conf + sed 's/WorldDatabaseInfo.*/WorldDatabaseInfo\t = '"\"${mangosdb}\""'/g' /home/${user}/one/etc/mangosd.conf > /home/${user}/one/etc/mangosd.conf.dist + sed 's/CharacterDatabaseInfo.*/CharacterDatabaseInfo\t = '"\"${chardb}\""'/g' /home/${user}/one/etc/mangosd.conf.dist > /home/${user}/one/etc/mangosd.conf + rm -rf /home/${user}/one/etc/mangos.conf.dist + fi + + if [ -f /home/${user}/one/etc/realmd.conf.dist ]; then + sed 's/LoginDatabaseInfo.*/LoginDatabaseInfo\t = '"\"${realmdb}\""'/g' /home/${user}/one/etc/realmd.conf.dist > /home/${user}/one/etc/realmd.conf + rm -rf /home/${user}/one/etc/realmd.conf.dist + fi + + chown ${user}:${user} /home/${user}/one/etc/mangosd.conf + chown ${user}:${user} /home/${user}/one/etc/realmd.conf + rm -rf /home/${user}/db.conf + else + su -c "mv /home/$user/one/etc/mangosd.conf.dist /home/$user/one/etc/mangosd.conf" -s /bin/bash $user + su -c "mv /home/$user/one/etc/realmd.conf.dist /home/$user/one/etc/realmd.conf" -s /bin/bash $user + fi + + su -c "mv /home/$user/one/etc/ahbot.conf.dist /home/$user/one/etc/ahbot.conf" -s /bin/bash $user + echo -e "" echo -e "${BWhi}-------------------------" echo -e "${BGre}Auto Restart Scripts" diff --git a/src/modules/SD3 b/src/modules/SD3 index c56e2dd8..eb0771b1 160000 --- a/src/modules/SD3 +++ b/src/modules/SD3 @@ -1 +1 @@ -Subproject commit c56e2dd80c31d4a2c0147c0c52b310c5f151300d +Subproject commit eb0771b1ebde547a7f3823e607f76de8668b1ef0 From ec546ab6322402757c70d8236798999bb1a4fbf3 Mon Sep 17 00:00:00 2001 From: Warkdev Date: Tue, 13 Sep 2016 20:30:49 +0200 Subject: [PATCH 2/4] Fixing a typo in lazymangos.sh --- linux/lazymangos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/lazymangos.sh b/linux/lazymangos.sh index ef6b38c9..6f153a8d 100755 --- a/linux/lazymangos.sh +++ b/linux/lazymangos.sh @@ -313,7 +313,7 @@ mangos_install() sed 's/LoginDatabaseInfo.*/LoginDatabaseInfo\t = '"\"${realmdb}\""'/g' /home/${user}/zero/etc/mangosd.conf.dist > /home/${user}/zero/etc/mangosd.conf sed 's/WorldDatabaseInfo.*/WorldDatabaseInfo\t = '"\"${mangosdb}\""'/g' /home/${user}/zero/etc/mangosd.conf > /home/${user}/zero/etc/mangosd.conf.dist sed 's/CharacterDatabaseInfo.*/CharacterDatabaseInfo\t = '"\"${chardb}\""'/g' /home/${user}/zero/etc/mangosd.conf.dist > /home/${user}/zero/etc/mangosd.conf - rm -rf /home/${user}/zero/etc/mangos.conf.dist + rm -rf /home/${user}/zero/etc/mangosd.conf.dist fi if [ -f /home/${user}/zero/etc/realmd.conf.dist ]; then From 14114733aa90b033a3a9e806f10cbe73e2942575 Mon Sep 17 00:00:00 2001 From: Warkdev Date: Tue, 13 Sep 2016 20:31:21 +0200 Subject: [PATCH 3/4] Fixing another typo for one install in lazymangos.sh --- linux/lazymangos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/lazymangos.sh b/linux/lazymangos.sh index 6f153a8d..1a8370a3 100755 --- a/linux/lazymangos.sh +++ b/linux/lazymangos.sh @@ -489,7 +489,7 @@ mangos_install() sed 's/LoginDatabaseInfo.*/LoginDatabaseInfo\t = '"\"${realmdb}\""'/g' /home/${user}/one/etc/mangosd.conf.dist > /home/${user}/one/etc/mangosd.conf sed 's/WorldDatabaseInfo.*/WorldDatabaseInfo\t = '"\"${mangosdb}\""'/g' /home/${user}/one/etc/mangosd.conf > /home/${user}/one/etc/mangosd.conf.dist sed 's/CharacterDatabaseInfo.*/CharacterDatabaseInfo\t = '"\"${chardb}\""'/g' /home/${user}/one/etc/mangosd.conf.dist > /home/${user}/one/etc/mangosd.conf - rm -rf /home/${user}/one/etc/mangos.conf.dist + rm -rf /home/${user}/one/etc/mangosd.conf.dist fi if [ -f /home/${user}/one/etc/realmd.conf.dist ]; then From c45144249d0948dd2c49f4195a07c802c6eeb738 Mon Sep 17 00:00:00 2001 From: Warkdev Date: Thu, 15 Sep 2016 20:52:09 +0200 Subject: [PATCH 4/4] Integration of the ExtractResources.sh for MangosZero. Tell us where your game binaries are and it will be auto-magically configured ! --- linux/lazymangos.sh | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/linux/lazymangos.sh b/linux/lazymangos.sh index 1a8370a3..094ca39b 100755 --- a/linux/lazymangos.sh +++ b/linux/lazymangos.sh @@ -343,6 +343,58 @@ mangos_install() echo -e "${BGre}Please view the README in /home/$user/" echo -e "${BWhi}---------------------------------------" echo -e "" + + echo -e "" + echo -e "${BWhi}Provide the path of your game directory" + read path + + if [ -d "${path}" ]; then + dir=$(basename ${path}) + echo -e "" + echo -e "${BWhi}-------------------------" + echo -e "${BGre}Copying Game... " + echo -e "${BWhi}-------------------------" + sleep 1 + mkdir /home/${user}/zero/game + cp -R ${path} /home/${user}/zero/game + chown -R ${user}:${user} /home/${user}/zero/game + rm -rf /home/${user}/zero/game/${dir}/Buildings + rm -rf /home/${user}/zero/game/${dir}/vmaps + rm -rf /home/${user}/zero/game/${dir}/mmaps + rm -rf /home/${user}/zero/game/${dir}/maps + rm -rf /home/${user}/zero/game/${dir}/dbc + echo -e "" + echo -e "${BWhi}-------------------------" + echo -e "${BGre}Copying Tools... " + echo -e "${BWhi}-------------------------" + sleep 1 + sudo su - ${user} -c "cp -R /home/${user}/zero/bin/tools/* /home/${user}/zero/game/${dir}" + sudo su - ${user} -c "cd /home/${user}/zero/game/${dir}; ./ExtractResources.sh" + echo -e "" + echo -e "${BWhi}-------------------------" + echo -e "${BGre}Moving dbc... " + echo -e "${BWhi}-------------------------" + sudo su - ${user} -c "mv /home/${user}/zero/game/${dir}/dbc /home/${user}/zero/bin" + + echo -e "" + echo -e "${BWhi}-------------------------" + echo -e "${BGre}Moving vmaps... " + echo -e "${BWhi}-------------------------" + sudo su - ${user} -c "mv /home/${user}/zero/game/${dir}/vmaps /home/${user}/zero/bin" + + echo -e "" + echo -e "${BWhi}-------------------------" + echo -e "${BGre}Moving mmaps... " + echo -e "${BWhi}-------------------------" + sudo su - ${user} -c "mv /home/${user}/zero/game/${dir}/mmaps /home/${user}/zero/bin" + + echo -e "" + echo -e "${BWhi}-------------------------" + echo -e "${BGre}Moving maps... " + echo -e "${BWhi}-------------------------" + sudo su - ${user} -c "mv /home/${user}/zero/game/${dir}/maps /home/${user}/zero/bin" + fi + exit else if [ $choice -eq 2 ]; then