summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsayad2021-01-28 09:53:05 +0600
committersayad2021-01-28 09:53:05 +0600
commitfa785163fe3fb41ee42ded5d17eaac9b0a87f160 (patch)
tree26eed5db66ef36da2b2bed9d5249b8ad085c350b
parent5f4c80bf3f03ce6c5c4d6dbfb67a10d9a5f1f677 (diff)
downloadaur-fa785163fe3fb41ee42ded5d17eaac9b0a87f160.tar.gz
Bug fix
-rw-r--r--prepare49
1 files changed, 25 insertions, 24 deletions
diff --git a/prepare b/prepare
index 6181677559d4..782bc444ccd9 100644
--- a/prepare
+++ b/prepare
@@ -8,26 +8,16 @@ ver510=11
ver511=rc5
_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.\n"
+ fi
+
+_distro="Arch"
# create build dir early
_path="${_where}"
- if [ -z "$_OPTIPROFILE" ] && [ ! -e "$_path"/cpuschedset ]; then
- # Prompt about optimized configurations. Available variable values will overwrite customization.cfg/external config ones.
- plain "Do you want to use a predefined optimized profile?"
- read -rp "`echo $' > 1.Custom\n 2.Ryzen Desktop (Performance)\n 3.Other Desktop (Performance)\nchoice[1-3?]: '`" _OPTIPROFILE;
- fi
- if [ "$_OPTIPROFILE" = "2" ]; then
- source "$_where"/ryzen-desktop-profile.cfg && msg2 "Ryzen Desktop (Performance) profile will be used." && msg2 "" && cp "$_where"/ryzen-desktop-profile.cfg ~/.config/linux-tkg.cfg
- elif [ "$_OPTIPROFILE" = "3" ]; then
- source "$_where"/generic-desktop-profile.cfg && msg2 "Generic Desktop (Performance) profile will be used." && msg2 "" && cp "$_where"/ryzen-desktop-profile.cfg ~/.config/linux-tkg.cfg
- fi
-
- # 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.\n"
-# fi
-
if [ -z "$_version" ] && [ ! -e "$_path"/versel ]; then
echo "_basever=510" > "$_path"/versel
echo "_basekernel=5.10" >> "$_path"/versel
@@ -46,19 +36,30 @@ _tkg_initscript() {
fi
# source versel early if present
- if [ -e "${_path}"/versel ]; then
- source "${_path}"/versel
+ # if [ -e "${_path}"/versel ]; then
+ # source "${_path}"/versel
+ # fi
+
+ if [ -z "$_OPTIPROFILE" ] && [ ! -e "$_path"/cpuschedset ]; then
+ # Prompt about optimized configurations. Available variable values will overwrite customization.cfg/external config ones.
+ plain "Do you want to use a predefined optimized profile?"
+ read -rp "`echo $' > 1.Custom\n 2.Ryzen Desktop (Performance)\n 3.Other Desktop (Performance)\nchoice[1-3?]: '`" _OPTIPROFILE;
+ fi
+ if [ "$_OPTIPROFILE" = "2" ]; then
+ source "$_where"/ryzen-desktop-profile.cfg && msg2 "Ryzen Desktop (Performance) profile will be used." && msg2 ""
+ elif [ "$_OPTIPROFILE" = "3" ]; then
+ source "$_where"/generic-desktop-profile.cfg && msg2 "Generic Desktop (Performance) profile will be used." && msg2 ""
fi
# source cpuschedset early if present
- if [ -e "${_path}"/cpuschedset ]; then
- source "${_path}"/cpuschedset
- fi
+ # if [ -e "${_path}"/cpuschedset ]; then
+ # source "${_path}"/cpuschedset
+ # fi
# source compilerset early if present
- if [ -e "${_path}"/compilerset ]; then
- source "${_path}"/compilerset
- fi
+ # if [ -e "${_path}"/compilerset ]; then
+ # source "${_path}"/compilerset
+ # fi
# CPU SCHED selector
if [ -z "$_cpusched" ] && [ ! -e "${_path}"/cpuschedset ]; then