PKGBUILD: sourcing order fix (#653)

* PKGBUILD: source prepare after the config files

The git mirror wasn't configured with the user choice otherwise
Fixes: #647

* install.sh: honor external config file
This commit is contained in:
Adel Kara Slimane
2022-11-23 15:13:07 +01:00
committed by GitHub
parent f5cd3ea3b3
commit 75ea27821f
2 changed files with 8 additions and 1 deletions

View File

@@ -31,7 +31,6 @@ _distro="Arch"
declare -p -x > current_env
source "$_where"/customization.cfg # load default configuration from file
source "$_where"/linux-tkg-config/prepare
if [ -e "$_EXT_CONFIG_PATH" ]; then
msg2 "External configuration file $_EXT_CONFIG_PATH will be used and will override customization.cfg values."
@@ -40,6 +39,8 @@ fi
source current_env
source "$_where"/linux-tkg-config/prepare
# Make sure we're in a clean state
if [ ! -e "$_where"/BIG_UGLY_FROGMINER ]; then
_tkg_initscript

View File

@@ -44,6 +44,12 @@ plain() {
declare -p -x > current_env
source customization.cfg
if [ -e "$_EXT_CONFIG_PATH" ]; then
msg2 "External configuration file $_EXT_CONFIG_PATH will be used and will override customization.cfg values."
source "$_EXT_CONFIG_PATH"
fi
. current_env
source linux-tkg-config/prepare