nchebrov/azerothcore_installer
1
0
Fork 0
mirror of https://github.com/hermensbas/azerothcore_installer.git synced 2026-01-30 15:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

initial setup after some tweaking

Browse Source
This commit is contained in:
bash
2024-07-22 23:26:52 +00:00
parent 1f10fe58e0
commit 12425e05fa
23 changed files with 784 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/merge_core.sh Executable file
View File

@@ -0,0 +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