From 92a7f8b5bd0c50d739b2166e2a26c0acebec2281 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Wed, 13 Oct 2021 17:09:55 +0200 Subject: [PATCH] Revert "feat(APPS/installer): configure remote and pull branch in conf/config.sh (#8364)" (#8486) This reverts commit f5c8afcf0b63083ddd0afcdb013e13eb5a873780. --- apps/installer/includes/functions.sh | 2 +- conf/dist/config.sh | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/apps/installer/includes/functions.sh b/apps/installer/includes/functions.sh index d7f172538..cd4d746e5 100644 --- a/apps/installer/includes/functions.sh +++ b/apps/installer/includes/functions.sh @@ -47,7 +47,7 @@ function inst_configureOS() { function inst_updateRepo() { cd "$AC_PATH_ROOT" - git pull "$ORIGIN_REMOTE" "$INSTALLER_PULL_FROM" + git pull origin $(git rev-parse --abbrev-ref HEAD) } function inst_resetRepo() { diff --git a/conf/dist/config.sh b/conf/dist/config.sh index f78428cbf..05cbaaa32 100644 --- a/conf/dist/config.sh +++ b/conf/dist/config.sh @@ -29,16 +29,6 @@ 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 change it to "master" if you want the latest updates -INSTALLER_PULL_FROM=$(git rev-parse --abbrev-ref HEAD) - ############################################## # # COMPILER_CONFIGURATIONS