diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 45ed37b1..08e58ee9 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1652,10 +1652,9 @@ init_wine_ver () { if [[ -d "${WINEDIR}" ]] ; then [[ ! -f "${WINEDIR}/version" ]] && echo "${PW_WINE_USE}" > "${WINEDIR}/version" - if [[ ! -d "${WINEDIR}/lib64/" ]] && [[ -d "${WINEDIR}/lib/wine/x86_64-unix" ]] ; then - create_new_dir "${WINEDIR}/lib64/wine" - mv -f "${WINEDIR}/lib/wine/x86_64-unix" "${WINEDIR}/lib64/wine/" - mv -f "${WINEDIR}/lib/wine/x86_64-windows" "${WINEDIR}/lib64/wine/" + if [[ ! -d "${WINEDIR}/lib64/wine" ]] && [[ -d "${WINEDIR}/lib/wine/x86_64-unix" ]] ; then + create_new_dir "${WINEDIR}/lib64/" + try_force_link_dir "${WINEDIR}/lib/wine/" "${WINEDIR}/lib64/" fi for mono_gecko_chk in "mono" "gecko" ; do @@ -1687,14 +1686,16 @@ init_wine_ver () { fi fi - export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" - if [[ -d "${PATH_TO_GAME}" ]] ; then - export WINEDLLPATH+=":${PATH_TO_GAME}" - fi + WINEDLLPATH="${WINEDIR}/lib/wine" + [[ ! -L "${WINEDIR}/lib64/wine" ]] && WINEDLLPATH+=":${WINEDIR}/lib64/wine" + [[ -d "${PATH_TO_GAME}" ]] && WINEDLLPATH+=":${PATH_TO_GAME}" + export WINEDLLPATH fi if ! check_flatpak ; then - export WINE_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib" + WINE_LIBRARY_PATH="${WINEDIR}/lib" + [[ ! -L "${WINEDIR}/lib64/wine" ]] && WINE_LIBRARY_PATH+=":${WINEDIR}/lib64" + export WINE_LIBRARY_PATH fi export MEDIACONV_BLANK_VIDEO_FILE="${WINEDIR}"/share/media/blank.mkv