Commit e23904d5 authored by Tk-Glitch's avatar Tk-Glitch

wine-tkg/proton-tkg: Introduce split configuration files for basic/advanced settings.

Wine/Proton-tkg has grown over the years into a pretty complex machine, and the amount of customization can be quite overwheilming for many users. To make things smoother, I have decided to start streamlining the initial configuration phase to answer the simple needs, while keeping the same advanced configuration options available.

Config files for wine/proton-tkg are now split in two parts.
One for basic settings (which replaced the global config file we had before), and one for advanced settings (wine|proton-tkg-profiles/advanced-customization.cfg).

 - Both files are loaded sequentially so the resulting configuration itself is virtually unchanged.
 - External config handling is unchanged and will load all settings from a single file as before.
 - External config files examples have been added (`wine|proton-tkg-profiles/sample-external-config.cfg`) to help as a result.

You can expect more changes regarding ease of use and default configuration in the near future.
parent e265d250
......@@ -105,6 +105,7 @@ pkgver() {
# overcomplicated BS
source "${_frogwhere}"/proton-tkg.cfg
source "${_frogwhere}"/proton-tkg-profiles/advanced-customization.cfg
if [ -e "$_EXT_CONFIG_PATH" ]; then
source "$_EXT_CONFIG_PATH"
fi
......@@ -164,6 +165,7 @@ prepare() {
ln -s -f "${_frogwhere}/proton-tkg.cfg" "${srcdir}/"
ln -s -f "${_frogwhere}/proton-tkg.sh" "${srcdir}/"
ln -s -f "${_frogwhere}/proton-tkg-userpatches" "${srcdir}/"
ln -s -f "${_frogwhere}/proton-tkg-profiles" "${srcdir}/"
}
build() {
......
# 'Wine-to-rule-them-all' - Proton-TkG advanced config file
##
## This config file contains advanced settings for your build.
## For the basic configuration, see ../proton-tkg.cfg
##
# This is a simplified config file with minimal comments. See ../../wine-tkg-git/wine-tkg-profiles/sample-external-config.cfg for more details.
# Some options will be missing from this config file compared to wine-tkg-git as they are enforced.
# Proton branch to target for lsteamclient libs and steam helper on 4.x+ - When using a Wine 3.x base, "proton_3.16" branch will be enforced
_proton_branch="proton_5.0"
# Proton SDL Joystick support, xinput hacks and other gamepad additions. _gamepad_additions depends on _sdl_joy_support.
_sdl_joy_support="true"
_gamepad_additions="false"
# Proton non-vr-related wined3d additions - Disabled on staging independently of this setting
_wined3d_additions="true"
# Disable nvapi and nvapi64 - Common fix for various games when using a Nvidia GPU
# Might create issues on some native vulkan game calling nvapi for some extremely dumb reason, such as Doom Eternal
_proton_nvapi_disable="false"
# Disable winedbg - (Used to fix GTA V online crash before Proton 5.0-4 02951753)
_proton_winedbg_disable="false"
# Enforce IMAGE_FILE_LARGE_ADDRESS_AWARE - Fixes 32-bit games hitting address space limitations.
# *Some* games might not like that (only known case so far is System Shock 2).
_proton_force_LAA="true"
# Enable the use of winelib steam.exe to launch games that checks if Steam is running such as Assetto Corsa - Only works with a Wine 4.0+ base
# Will disable "server-Desktop_Refcount" and "ws2_32-TransmitFile" patchsets on staging past 4e7071e4 (4.7+)
_proton_use_steamhelper="true"
# Set to true to disable proton's steamclient lib substitution. Allows running windows steam client in proton (only affects 4.19+)
# ! This will prevent most Steam games to run directly from proton - You only want to use this as a secondary build for non-steam games or running windows steam/games from windows steam !
_steamclient_noswap="false"
# Enable DXVK's async pipecompiler on a compatible DXVK build. Also known as the "poe hack", that option *could* be unsafe regarding anticheats, so beware !
_proton_dxvk_async="false"
# COMPILER/BUILD OPTIONS
# External config file to use - If the given file exists in path, it will override default config - Default is ~/.config/frogminer/proton-tkg.cfg
#_EXT_CONFIG_PATH=~/.config/frogminer/proton-tkg.cfg
# Set to a desired additional tag to differentiate builds
_PROTON_NAME_ADDON=""
# Custom compiler root dirs - Leave empty to use system compilers
# Example: CUSTOM_MINGW_PATH="/home/frog/PKGBUILDS/mostlyportable-gcc/mingw-mostlyportable-9.2.0"
# Example: CUSTOM_GCC_PATH="/home/frog/PKGBUILDS/mostlyportable-gcc/gcc-mostlyportable-9.2.0"
CUSTOM_MINGW_PATH=""
CUSTOM_GCC_PATH=""
_LOCAL_OPTIMIZED="true"
_GCC_FLAGS="-pipe -O2 -ftree-vectorize"
_LD_FLAGS="-pipe -O2 -ftree-vectorize"
_CROSS_FLAGS="-pipe -O2 -ftree-vectorize"
_CROSS_LD_FLAGS="-pipe -O2 -ftree-vectorize"
_NUKR="true"
_NOCOMPILE="false"
_NOINITIALPROMPT="false"
# Set to true to remove trailing patchmsg strings in logs - Useful to review the list of patches used without fluff
_nopatchmsg="false"
# WINE FLAVOUR SETTINGS
# Set to the path of a custom wine source repo if desired (i.e. https://github.com/ValveSoftware/wine). Leave empty to use official wine source.
# Use the _plain_version option to target a specific commit for this source
# ! Make sure to disable staging if your source isn't compatible with it or it will fail to apply !
_custom_wine_source=""
# Add a configurable spin count to fsync - might help performance but can introduce stability issues/hanging. Try setting WINEFSYNC_SPINCOUNT=100 envvar
_fsync_spincounts="true"
_plain_mirrorsrc="true"
# Sets custom configure-args for 64-bit, separated by a space (example: "--without-mingw --with-vkd3d")
_configure_userargs64="--with-x --with-gstreamer --with-xattr"
# Sets custom configure-args for 32-bit, separated by a space (example: "--without-mingw --with-vkd3d")
_configure_userargs32="--with-x --with-gstreamer --with-xattr"
_dxvk_version=""
_dxvk_async="false"
_d9vk_version=""
# pba - Enable with PBA_ENABLE=1 envvar, force-disabled on 3.19 & higher due to known broken state
_use_pba="true"
# legacy gallium nine - This is only available for 4.1-devel (prior to e24b162) and older wine versions - Use nine standalone instead for newer wine
_use_legacy_gallium_nine="false"
# GAME-SPECIFIC PATCHES
_warframelauncher_fix="true"
_f4skyrimse_fix="false"
_fortnite_fix="false"
_OW_fix="true"
_staging_pulse_disable="false"
_server_send_hwmsg_disable="true"
_318python_fix="true"
# OTHER PATCHES
_CSMT_toggle="true"
_GLSL_toggle="false"
_MIME_NOPE="true"
_steam_fix="true"
_lowlatency_audio="false"
_launch_with_dedicated_gpu="false"
_clock_monotonic="true"
_large_address_aware="true"
_stg_shared_mem_default="false"
_proton_mf_hacks="true"
_proton_rawinput="true"
# Sets the value of an additional fake refresh rate in virtual desktop mode. Leave empty to keep default.
_fake_refresh_rate=""
# Enforce mscvrt Dlls to native then builtin - from Proton - Can be detrimental on 4.3+
_msvcrt_nativebuiltin="true"
# Set the default wine version to win10 (instead of win7)
_win10_default="true"
# USER PATCHES
_user_patches="true"
_user_patches_no_confirm="false"
# 'Wine-to-rule-them-all' - Proton-TkG config file - external config example
##
## This config file is an example of external config (typical path: ~/.config/frogminer/proton-tkg.cfg)
## It contains most available options in a centralized way - The few missing options are part of wine-tkg-git and mostly not interesting for proton-tkg
##
# This is a simplified config file with minimal comments. See ../../wine-tkg-git/wine-tkg-profiles/sample-external-config.cfg for more details.
# Some options will be missing from this config file compared to wine-tkg-git as they are enforced.
#### NON-MAKEPKG OPTIONS (Won't affect makepkg builds) ####
# Set to true to get a prompt after the 64-bit part is built, enabling package switching before building the 32-bit side.
# This is a workaround for distros shipping broken devel packages that can't coexist as multilib
_nomakepkg_midbuild_prompt="false"
# Set to true if you want to skip the uninstaller at the end of proton-tkg building
_skip_uninstaller="false"
# Set to true if you do not want your build to be automatically moved to your compatibilitytools.d dir
_no_autoinstall="false"
####
# PROTON-TKG OPTIONS
# Proton branch to target for lsteamclient libs and steam helper on 4.x+ - When using a Wine 3.x base, "proton_3.16" branch will be enforced
_proton_branch="proton_5.0"
# Proton SDL Joystick support, xinput hacks and other gamepad additions. _gamepad_additions depends on _sdl_joy_support.
_sdl_joy_support="true"
_gamepad_additions="false"
# Proton non-vr-related wined3d additions - Disabled on staging independently of this setting
_wined3d_additions="true"
# Proton wined3d-interop and friends for SteamVR support
_steamvr_support="false"
# Disable nvapi and nvapi64 - Common fix for various games when using a Nvidia GPU
# Might create issues on some native vulkan game calling nvapi for some extremely dumb reason, such as Doom Eternal
_proton_nvapi_disable="false"
# Disable winedbg - (Used to fix GTA V online crash before Proton 5.0-4 02951753)
_proton_winedbg_disable="false"
# Enforce IMAGE_FILE_LARGE_ADDRESS_AWARE - Fixes 32-bit games hitting address space limitations.
# *Some* games might not like that (only known case so far is System Shock 2).
_proton_force_LAA="true"
# Set Pulseaudio latency to 60ms - Can help with sound crackling issues on some configs
_proton_pulse_lowlat="false"
# Enable the use of winelib steam.exe to launch games that checks if Steam is running such as Assetto Corsa - Only works with a Wine 4.0+ base
# Will disable "server-Desktop_Refcount" and "ws2_32-TransmitFile" patchsets on staging past 4e7071e4 (4.7+)
_proton_use_steamhelper="true"
# Set to true to disable proton's steamclient lib substitution. Allows running windows steam client in proton (only affects 4.19+)
# ! This will prevent most Steam games to run directly from proton - You only want to use this as a secondary build for non-steam games or running windows steam/games from windows steam !
_steamclient_noswap="false"
# Enable Winetricks prompt on game launch - Will use your system winetricks, so you need it installed
_proton_winetricks="true"
# Enable DXVK's async pipecompiler on a compatible DXVK build. Also known as the "poe hack", that option *could* be unsafe regarding anticheats, so beware !
_proton_dxvk_async="false"
# DXVK options
# hud : https://github.com/doitsujin/dxvk#hud
# configfile : https://github.com/doitsujin/dxvk/wiki/Configuration#configuration-file
_proton_dxvk_hud=""
_proton_dxvk_configfile=""
# COMPILER/BUILD OPTIONS
# Custom compiler root dirs - Leave empty to use system compilers
# Example: CUSTOM_MINGW_PATH="/home/frog/PKGBUILDS/mostlyportable-gcc/mingw-mostlyportable-9.2.0"
# Example: CUSTOM_GCC_PATH="/home/frog/PKGBUILDS/mostlyportable-gcc/gcc-mostlyportable-9.2.0"
CUSTOM_MINGW_PATH=""
CUSTOM_GCC_PATH=""
_LOCAL_OPTIMIZED="true"
_GCC_FLAGS="-pipe -O2 -ftree-vectorize"
_LD_FLAGS="-pipe -O2 -ftree-vectorize"
_CROSS_FLAGS="-pipe -O2 -ftree-vectorize"
_CROSS_LD_FLAGS="-pipe -O2 -ftree-vectorize"
_NUKR="true"
_NOCOMPILE="false"
_NOINITIALPROMPT="false"
# Set to true to remove trailing patchmsg strings in logs - Useful to review the list of patches used without fluff
_nopatchmsg="false"
# Set to a desired additional tag to differentiate builds
_PROTON_NAME_ADDON=""
# WINE FLAVOUR SETTINGS
# Set to the path of a custom wine source repo if desired (i.e. https://github.com/ValveSoftware/wine). Leave empty to use official wine source.
# Use the _plain_version option to target a specific commit for this source
# ! Make sure to disable staging if your source isn't compatible with it or it will fail to apply !
_custom_wine_source=""
_use_esync="true"
_use_fsync="true"
# Add a configurable spin count to fsync - might help performance but can introduce stability issues/hanging. Try setting WINEFSYNC_SPINCOUNT=100 envvar
_fsync_spincounts="true"
_plain_version=""
_plain_mirrorsrc="true"
# Sets custom configure-args for 64-bit, separated by a space (example: "--without-mingw --with-vkd3d")
_configure_userargs64="--with-x --with-gstreamer --with-xattr"
# Sets custom configure-args for 32-bit, separated by a space (example: "--without-mingw --with-vkd3d")
_configure_userargs32="--with-x --with-gstreamer --with-xattr"
_use_staging="true"
_staging_version=""
# You can set _use_dxvk to either "prebuilt" (for builds made with dxvk-tools for example), "release" (using github's latest) or "false" (disabled)
# Setting it to "true" will default to "release"
_use_dxvk="release"
_dxvk_dxgi="false"
_dxvk_version=""
_dxvk_async="false"
# You can set _use_d9vk to either "prebuilt" (for builds made with dxvk-tools for example), "release" (using github's latest) or "false" (disabled)
# Setting it to "true" will default to "release"
_use_d9vk="release"
_d9vk_version=""
# vkd3d - Use the currently installed vkd3d packages (both 32 and 64-bit) for d3d12 to vulkan translation - If they aren't (both) installed, vkd3d won't be used
# !!! Requires either _dxvk_dxgi="false" or to set PROTON_USE_WINE_DXGI=1 in your user_settings.py or as runtime env var !!!
# This will also add DXVK configuration support to Wine's DXGI
_use_vkd3d="true"
# pba - Enable with PBA_ENABLE=1 envvar, force-disabled on 3.19 & higher due to known broken state
_use_pba="true"
# legacy gallium nine - This is only available for 4.1-devel (prior to e24b162) and older wine versions - Use nine standalone instead for newer wine
_use_legacy_gallium_nine="false"
# GAME-SPECIFIC PATCHES
_warframelauncher_fix="true"
_ffxivlauncher_fix="false"
_f4skyrimse_fix="false"
_fortnite_fix="false"
_sims3_fix="false"
_mtga_fix="false"
_mwo_fix="false"
_childwindow_fix="true"
_lol920_fix="false"
_OW_fix="true"
_assettocorsa_hudperf_fix="false"
_staging_pulse_disable="false"
_server_send_hwmsg_disable="true"
_318python_fix="true"
# Fix for Mortal Kombat 11 - Requires staging, native mfplat (win7) and a different GPU driver than RADV - Enable with the WINE_LOW_USER_SPACE_LIMIT=1 envvar
_mk11_fix="true"
# ! _re4_fix="true" requires _wined3d_additions="false" or it will get ignored !
_re4_fix="false"
# OTHER PATCHES
_CSMT_toggle="true"
_GLSL_toggle="false"
_MIME_NOPE="true"
_steam_fix="true"
_lowlatency_audio="false"
_launch_with_dedicated_gpu="false"
_clock_monotonic="true"
_FS_bypass_compositor="true"
_proton_fs_hack="true"
_plasma_systray_fix="false"
_large_address_aware="true"
_stg_shared_mem_default="false"
_proton_mf_hacks="true"
_proton_rawinput="true"
# Sets the value of an additional fake refresh rate in virtual desktop mode. Leave empty to keep default.
_fake_refresh_rate=""
# Enforce mscvrt Dlls to native then builtin - from Proton - Can be detrimental on 4.3+
_msvcrt_nativebuiltin="true"
# Set the default wine version to win10 (instead of win7)
_win10_default="true"
# USER PATCHES
# community patches - add patches (separated by a space) of your choice by name from the community-patches dir - proton-tkg uses wine-tkg-git patches dir
# example: _community_patches="amdags.mypatch GNUTLShack.mypatch"
_community_patches=""
_user_patches="true"
_user_patches_no_confirm="false"
# 'Wine-to-rule-them-all' - Proton-TkG config file
# 'Wine-to-rule-them-all' - Proton-TkG simple config file
##
## This config file contain the basic settings of your build.
## For deeper configuration, see proton-tkg-profiles/advanced-customization.cfg
##
# This is a simplified config file with minimal comments. See ../wine-tkg-git/customization.cfg for more details.
# Some options will be missing from this config file compared to wine-tkg-git as they are enforced.
......@@ -17,49 +22,18 @@ _no_autoinstall="false"
####
# PROTON-TKG OPTIONS
# Proton branch to target for lsteamclient libs and steam helper on 4.x+ - When using a Wine 3.x base, "proton_3.16" branch will be enforced
_proton_branch="proton_5.0"
# Proton SDL Joystick support, xinput hacks and other gamepad additions. _gamepad_additions depends on _sdl_joy_support.
_sdl_joy_support="true"
_gamepad_additions="false"
# Proton non-vr-related wined3d additions - Disabled on staging independently of this setting
_wined3d_additions="true"
# PROTON-TKG OPTIONS
# Proton wined3d-interop and friends for SteamVR support
_steamvr_support="false"
# Disable nvapi and nvapi64 - Common fix for various games when using a Nvidia GPU
# Might create issues on some native vulkan game calling nvapi for some extremely dumb reason, such as Doom Eternal
_proton_nvapi_disable="false"
# Disable winedbg - (Used to fix GTA V online crash before Proton 5.0-4 02951753)
_proton_winedbg_disable="false"
# Enforce IMAGE_FILE_LARGE_ADDRESS_AWARE - Fixes 32-bit games hitting address space limitations.
# *Some* games might not like that (only known case so far is System Shock 2).
_proton_force_LAA="true"
# Set Pulseaudio latency to 60ms - Can help with sound crackling issues on some configs
_proton_pulse_lowlat="false"
# Enable the use of winelib steam.exe to launch games that checks if Steam is running such as Assetto Corsa - Only works with a Wine 4.0+ base
# Will disable "server-Desktop_Refcount" and "ws2_32-TransmitFile" patchsets on staging past 4e7071e4 (4.7+)
_proton_use_steamhelper="true"
# Set to true to disable proton's steamclient lib substitution. Allows running windows steam client in proton (only affects 4.19+)
# ! This will prevent most Steam games to run directly from proton - You only want to use this as a secondary build for non-steam games or running windows steam/games from windows steam !
_steamclient_noswap="false"
# Enable Winetricks prompt on game launch - Will use your system winetricks, so you need it installed
_proton_winetricks="true"
# Enable DXVK's async pipecompiler on a compatible DXVK build. Also known as the "poe hack", that option *could* be unsafe regarding anticheats, so beware !
_proton_dxvk_async="false"
# DXVK options
# hud : https://github.com/doitsujin/dxvk#hud
# configfile : https://github.com/doitsujin/dxvk/wiki/Configuration#configuration-file
......@@ -67,53 +41,12 @@ _proton_dxvk_hud=""
_proton_dxvk_configfile=""
# COMPILER/BUILD OPTIONS
_EXT_CONFIG_PATH=~/.config/frogminer/proton-tkg.cfg
# Custom compiler root dirs - Leave empty to use system compilers
# Example: CUSTOM_MINGW_PATH="/home/frog/PKGBUILDS/mostlyportable-gcc/mingw-mostlyportable-9.2.0"
# Example: CUSTOM_GCC_PATH="/home/frog/PKGBUILDS/mostlyportable-gcc/gcc-mostlyportable-9.2.0"
CUSTOM_MINGW_PATH=""
CUSTOM_GCC_PATH=""
_LOCAL_OPTIMIZED="true"
_GCC_FLAGS="-pipe -O2 -ftree-vectorize"
_LD_FLAGS="-pipe -O2 -ftree-vectorize"
_CROSS_FLAGS="-pipe -O2 -ftree-vectorize"
_CROSS_LD_FLAGS="-pipe -O2 -ftree-vectorize"
_NUKR="true"
_NOCOMPILE="false"
_NOINITIALPROMPT="false"
# Set to true to remove trailing patchmsg strings in logs - Useful to review the list of patches used without fluff
_nopatchmsg="false"
# Set to a desired additional tag to differentiate builds
_PROTON_NAME_ADDON=""
# WINE FLAVOUR SETTINGS
# Set to the path of a custom wine source repo if desired (i.e. https://github.com/ValveSoftware/wine). Leave empty to use official wine source.
# Use the _plain_version option to target a specific commit for this source
# ! Make sure to disable staging if your source isn't compatible with it or it will fail to apply !
_custom_wine_source=""
_use_esync="true"
_use_fsync="true"
# Add a configurable spin count to fsync - might help performance but can introduce stability issues/hanging. Try setting WINEFSYNC_SPINCOUNT=100 envvar
_fsync_spincounts="true"
_plain_version=""
_plain_mirrorsrc="true"
# Sets custom configure-args for 64-bit, separated by a space (example: "--without-mingw --with-vkd3d")
_configure_userargs64="--with-x --with-gstreamer --with-xattr"
# Sets custom configure-args for 32-bit, separated by a space (example: "--without-mingw --with-vkd3d")
_configure_userargs32="--with-x --with-gstreamer --with-xattr"
_use_staging="true"
_staging_version=""
......@@ -121,41 +54,26 @@ _staging_version=""
# Setting it to "true" will default to "release"
_use_dxvk="release"
_dxvk_dxgi="false"
_dxvk_version=""
_dxvk_async="false"
# You can set _use_d9vk to either "prebuilt" (for builds made with dxvk-tools for example), "release" (using github's latest) or "false" (disabled)
# Setting it to "true" will default to "release"
_use_d9vk="release"
_d9vk_version=""
# vkd3d - Use the currently installed vkd3d packages (both 32 and 64-bit) for d3d12 to vulkan translation - If they aren't (both) installed, vkd3d won't be used
# !!! Requires either _dxvk_dxgi="false" or to set PROTON_USE_WINE_DXGI=1 in your user_settings.py or as runtime env var !!!
# This will also add DXVK configuration support to Wine's DXGI
_use_vkd3d="true"
# pba - Enable with PBA_ENABLE=1 envvar, force-disabled on 3.19 & higher due to known broken state
_use_pba="true"
# legacy gallium nine - This is only available for 4.1-devel (prior to e24b162) and older wine versions - Use nine standalone instead for newer wine
_use_legacy_gallium_nine="false"
# GAME-SPECIFIC PATCHES
_warframelauncher_fix="true"
_ffxivlauncher_fix="false"
_f4skyrimse_fix="false"
_fortnite_fix="false"
_sims3_fix="false"
_mtga_fix="false"
_mwo_fix="false"
_childwindow_fix="true"
_lol920_fix="false"
_OW_fix="true"
_assettocorsa_hudperf_fix="false"
_staging_pulse_disable="false"
_server_send_hwmsg_disable="true"
_318python_fix="true"
# Fix for Mortal Kombat 11 - Requires staging, native mfplat (win7) and a different GPU driver than RADV - Enable with the WINE_LOW_USER_SPACE_LIMIT=1 envvar
_mk11_fix="true"
......@@ -166,29 +84,9 @@ _re4_fix="false"
# OTHER PATCHES
_CSMT_toggle="true"
_GLSL_toggle="false"
_MIME_NOPE="true"
_steam_fix="true"
_lowlatency_audio="false"
_launch_with_dedicated_gpu="false"
_clock_monotonic="true"
_FS_bypass_compositor="true"
_proton_fs_hack="true"
_plasma_systray_fix="false"
_large_address_aware="true"
_stg_shared_mem_default="false"
_proton_mf_hacks="true"
_proton_rawinput="true"
# Sets the value of an additional fake refresh rate in virtual desktop mode. Leave empty to keep default.
_fake_refresh_rate=""
# Enforce mscvrt Dlls to native then builtin - from Proton - Can be detrimental on 4.3+
_msvcrt_nativebuiltin="true"
# Set the default wine version to win10 (instead of win7)
_win10_default="true"
# USER PATCHES
......
......@@ -5,7 +5,7 @@ pkgver=5.4.r12.ge5da84dc
# workaround for pkgrel overwritten on regen
pkgrel=1
eval pkgrel=255
eval pkgrel=256
_stgsrcdir='wine-staging-git'
_esyncsrcdir='esync'
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -114,8 +114,10 @@ msg2 ''
if [ -e "$_where"/proton_tkg_token ]; then
source "$_where"/proton_tkg_token
source "$_proton_tkg_path"/proton-tkg.cfg
source "$_proton_tkg_path"/proton-tkg-profiles/advanced-customization.cfg
else
source "$_where"/customization.cfg
source "$_where"/wine-tkg-profiles/advanced-customization.cfg
_EXTERNAL_INSTALL_TYPE="opt"
fi
......@@ -164,8 +166,10 @@ msg2 ''
# load default configuration from file again, in case of change
if [ -e "$_proton_tkg_path"/proton_tkg_token ]; then
source "$_proton_tkg_path"/proton-tkg.cfg
source "$_proton_tkg_path"/proton-tkg-profiles/advanced-customization.cfg
else
source "$_where"/customization.cfg
source "$_where"/wine-tkg-profiles/advanced-customization.cfg
fi
fi
fi
......@@ -391,7 +395,7 @@ _prepare() {
elif [ -n "$_EXT_CONFIG_PATH" ] && [ -e "$_EXT_CONFIG_PATH" ]; then
_cfgstringin="$_EXT_CONFIG_PATH" && _cfgstring && echo "External configuration file $_cfgstringout used" >> "$_where"/last_build_config.log
else
echo "Local customization.cfg file used" >> "$_where"/last_build_config.log
echo "Local cfg files used" >> "$_where"/last_build_config.log
fi
if [ "$_nomakepkg_midbuild_prompt" == "true" ]; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment