diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index a8b4f8d6..be30bce5 100755 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -143,6 +143,7 @@ Htylol Boria138 Vano Majukin Eljeyna +chal55rus SDR Mels Cefeiko @@ -150,7 +151,6 @@ Dezert1r Taz_mania Anton_Famillianov RidBowt -chal55rus UserDiscord Survolog gavr diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 2e8567e4..d8921f7c 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3071,7 +3071,6 @@ pw_yad_form_vulkan () { portwine_launch () { start_portwine - export GST_PLUGIN_SYSTEM_PATH_1_0="" if [[ "${PW_VIRTUAL_DESKTOP}" == "1" ]] ; then pw_run explorer "/desktop=PortProton,${PW_SCREEN_RESOLUTION}" ${WINE_WIN_START} "$portwine_exe" fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 9c696002..97ebf060 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -36,13 +36,20 @@ if [[ "$1" == *.ppack ]] ; then portwine_exe="$1" elif [[ -f "$1" ]] ; then portwine_exe="$(realpath "$1")" -elif [[ -f "$OLDPWD/$1" ]] && ([[ "$1" == *.exe ]] || [[ "$1" == *.bat ]]); then +elif [[ -f "$OLDPWD/$1" ]] \ +&& [[ "$1" == *.exe || "$1" == *.bat || "$1" == *.reg || "$1" == *.msi ]] +then portwine_exe="$(realpath "$OLDPWD/$1")" -elif [[ "$1" == "--debug" ]] && [[ -f "$2" ]] ; then +elif [[ "$1" == "--debug" ]] \ +&& [[ -f "$2" ]] +then portwine_exe="$(realpath "$2")" -elif [[ "$1" == "--debug" ]] && [[ -f "$OLDPWD/$2" ]] && ([[ "$2" == *.exe ]] || [[ "$2" == *.bat ]]); then +elif [[ "$1" == "--debug" ]] \ +&& [[ -f "$OLDPWD/$2" ]] \ +&& [[ "$2" == *.exe || "$2" == *.bat || "$2" == *.reg || "$2" == *.msi ]] +then portwine_exe="$(realpath "$OLDPWD/$2")" -elif [[ "$1" == *.exe ]] || [[ "$1" == *.bat ]]; then +elif [[ "$1" == *.exe || "$1" == *.bat || "$1" == *.msi ]]; then portwine_exe="$1" MISSING_DESKTOP_FILE=1 fi