diff options
| author | Kitzunu <24550914+Kitzunu@users.noreply.github.com> | 2021-10-13 17:09:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-13 17:09:55 +0200 |
| commit | 92a7f8b5bd0c50d739b2166e2a26c0acebec2281 (patch) | |
| tree | 8721316236f63757b537ae5242ece953447d0a69 | |
| parent | 430157f71d8a90da0a376efa33fc0cc53c327d21 (diff) | |
Revert "feat(APPS/installer): configure remote and pull branch in conf/config.sh (#8364)" (#8486)
This reverts commit f5c8afcf0b63083ddd0afcdb013e13eb5a873780.
| -rw-r--r-- | apps/installer/includes/functions.sh | 2 | ||||
| -rw-r--r-- | conf/dist/config.sh | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/apps/installer/includes/functions.sh b/apps/installer/includes/functions.sh index d7f1725387..cd4d746e51 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 f78428cbfa..05cbaaa32e 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 |