From 1b8c23cbee5e98f8f8a8084cfd4f7d1119c34a70 Mon Sep 17 00:00:00 2001 From: BytesGalore <3903215+BytesGalore@users.noreply.github.com> Date: Mon, 1 Nov 2021 11:28:20 +0100 Subject: [PATCH] feat(Bash/Installer): configure remote and pull branch in conf/config.sh (#8488) Co-authored-by: BytesGalore <3903215+BytesGalore@users.noreply.github.com> --- apps/installer/includes/functions.sh | 6 +++++- conf/dist/config.sh | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/apps/installer/includes/functions.sh b/apps/installer/includes/functions.sh index cd4d746e5..31c17f8f4 100644 --- a/apps/installer/includes/functions.sh +++ b/apps/installer/includes/functions.sh @@ -47,7 +47,11 @@ function inst_configureOS() { function inst_updateRepo() { cd "$AC_PATH_ROOT" - git pull origin $(git rev-parse --abbrev-ref HEAD) + if [ ! -z $INSTALLER_PULL_FROM ]; then + git pull "$ORIGIN_REMOTE" "$INSTALLER_PULL_FROM" + else + git pull "$ORIGIN_REMOTE" $(git rev-parse --abbrev-ref HEAD) + fi } function inst_resetRepo() { diff --git a/conf/dist/config.sh b/conf/dist/config.sh index 05cbaaa32..ceeb65633 100644 --- a/conf/dist/config.sh +++ b/conf/dist/config.sh @@ -29,6 +29,16 @@ BINPATH="$AC_PATH_ROOT/env/dist" # DATAPATH="$BINPATH/bin" # DATAPATH_ZIP="$DATAPATH/data.zip" +# azerothcore's official remote source address to pull from +# by default git will fetch form the azrothcore remote +# You can change it to "origin" if you want to fetch/pull from the set remote +ORIGIN_REMOTE="https://github.com/azerothcore/azerothcore-wotlk.git" + +# Branch configuration for the installer to pull from. +# By default git will select the current working branch +# You can set it to "master" if you want the latest updates +INSTALLER_PULL_FROM= + ############################################## # # COMPILER_CONFIGURATIONS