From f7618cf27297af007dc07042b5b4dcaf5e46d39d Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Wed, 28 Oct 2020 20:49:02 +0100 Subject: [PATCH] Default to Arch target when _distro is empty or when using the PKGBUILD Fixes https://github.com/Frogging-Family/linux-tkg/issues/104 --- PKGBUILD | 7 +++---- linux-tkg-config/prepare | 8 +++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 5ec1521..4380196 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,8 +13,8 @@ plain ' :syNNdhNNhssssssssssssssshNNhdNNys:' plain ' /ssyhhhysssssssssssssssssyhhhyss/' plain ' .ossssssssssssssssssssssssssssso.' plain ' :sssssssssssssssssssssssssssssssss:' -plain ' /sssssssssssssssssssssssssssssssssss/' -plain ' :sssssssssssssoosssssssoosssssssssssss:' +plain ' /sssssssssssssssssssssssssssssssssss/ Linux-tkg' +plain ' :sssssssssssssoosssssssoosssssssssssss: kernels' plain ' osssssssssssssoosssssssoossssssssssssso' plain ' osssssssssssyyyyhhhhhhhyyyyssssssssssso' plain ' /yyyyyyhhdmmmmNNNNNNNNNNNmmmmdhhyyyyyy/' @@ -25,12 +25,11 @@ plain ' `-+shdNNNNNNNNNNNNNNNdhs+-`' plain ' `.-:///////:-.`' _where="$PWD" # track basedir as different Arch based distros are moving srcdir around +_ispkgbuild="true" source "$_where"/customization.cfg # load default configuration from file source "$_where"/linux-tkg-config/prepare -_distro="Arch" - _tkg_initscript if [[ "$_sub" = rc* ]]; then diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index 2490b0d..0fe162c 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -9,7 +9,13 @@ ver510=rc1 _tkg_initscript() { # Load external configuration file if present. Available variable values will overwrite customization.cfg ones. if [ -e "$_EXT_CONFIG_PATH" ]; then - source "$_EXT_CONFIG_PATH" && msg2 "External configuration file $_EXT_CONFIG_PATH will be used to override customization.cfg values." && msg2 "" + source "$_EXT_CONFIG_PATH" && msg2 "External configuration file $_EXT_CONFIG_PATH will be used to override customization.cfg values.\n" + fi + + # Default to Arch + if [ -z "$_distro" ] || [ "$_ispkgbuild" = "true" ]; then + msg2 "Defaulting to Archlinux target\n" + _distro="Arch" fi # create build dir early