Commit 42feee47 authored by Mikhail Tergoev's avatar Mikhail Tergoev

Merge branch 'Boria138-fix-flatpak-wine'

parents 97645fe4 887d64fe
...@@ -413,6 +413,7 @@ check_user_conf () { ...@@ -413,6 +413,7 @@ check_user_conf () {
init_wine_ver () { init_wine_ver () {
if [[ "${PW_WINE_USE}" == "USE_SYSTEM_WINE" ]] \ if [[ "${PW_WINE_USE}" == "USE_SYSTEM_WINE" ]] \
&& command -v wine &>/dev/null ; then && command -v wine &>/dev/null ; then
if ! grep -i "flatpak" /etc/os-release &>/dev/null ; then
export WINEDIR="$RT_PREFIX/usr" export WINEDIR="$RT_PREFIX/usr"
export WINE="$RT_PREFIX/$(command -v wine)" export WINE="$RT_PREFIX/$(command -v wine)"
export WINELOADER="$WINE" export WINELOADER="$WINE"
...@@ -420,6 +421,14 @@ init_wine_ver () { ...@@ -420,6 +421,14 @@ init_wine_ver () {
export PW_USE_RUNTIME=0 export PW_USE_RUNTIME=0
export PW_NO_FSYNC=1 export PW_NO_FSYNC=1
else else
export WINEDIR="$RT_PREFIX/app"
export WINE="$RT_PREFIX/app/bin/wine"
export WINELOADER="$WINE"
export WINESERVER="$RT_PREFIX/app/bin/wineserver"
export PW_USE_RUNTIME=0
export PW_NO_FSYNC=1
fi
else
if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then
orig_IFS="$IFS" orig_IFS="$IFS"
IFS=$'\n' IFS=$'\n'
......
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