CastroFidel/PortWINE
3
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Boria138-reg' into devel

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-08-11 12:56:01 +03:00
commit 2a6347dfe7
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
data_from_portwine/scripts/functions_helper
View File

@ -3071,17 +3071,26 @@ pw_yad_form_vulkan () {
portwine_launch () { portwine_launch () {
start_portwine start_portwine
PORTWINE_MSI=$(basename "${portwine_exe}" | grep .msi) export GST_PLUGIN_SYSTEM_PATH_1_0=""
PORTWINE_BAT=$(basename "${portwine_exe}" | grep .bat)
if [[ "${PW_VIRTUAL_DESKTOP}" == "1" ]] ; then if [[ "${PW_VIRTUAL_DESKTOP}" == "1" ]] ; then
pw_run explorer "/desktop=PortProton,${PW_SCREEN_RESOLUTION}" ${WINE_WIN_START} "$portwine_exe" pw_run explorer "/desktop=PortProton,${PW_SCREEN_RESOLUTION}" ${WINE_WIN_START} "$portwine_exe"
elif [ ! -z "${PORTWINE_MSI}" ]; then
pw_run msiexec /i "$portwine_exe"
elif [[ ! -z "${PORTWINE_BAT}" || -n "${portwine_exe}" ]] ; then
pw_run ${WINE_WIN_START} "$portwine_exe"
else
pw_run winefile
fi fi
case "$portwine_exe" in
*.bat)
PW_USE_TERMINAL=1
pw_run cmd /c "$portwine_exe"
;;
*.msi)
pw_run msiexec /i "$portwine_exe"
;;
*.reg)
pw_run regedit "$portwine_exe"
;;
*)
pw_run winefile
;;
esac
} }
pw_winecfg () { pw_winecfg () {

6
data_from_portwine/scripts/start.sh
View File

@ -36,13 +36,13 @@ if [[ "$1" == *.ppack ]] ; then
portwine_exe="$1" portwine_exe="$1"
elif [[ -f "$1" ]] ; then elif [[ -f "$1" ]] ; then
portwine_exe="$(realpath "$1")" portwine_exe="$(realpath "$1")"
elif [[ -f "$OLDPWD/$1" ]] && [[ "$1" == *.exe ]] ; then elif [[ -f "$OLDPWD/$1" ]] && ([[ "$1" == *.exe ]] || [[ "$1" == *.bat ]]); then
portwine_exe="$(realpath "$OLDPWD/$1")" portwine_exe="$(realpath "$OLDPWD/$1")"
elif [[ "$1" == "--debug" ]] && [[ -f "$2" ]] ; then elif [[ "$1" == "--debug" ]] && [[ -f "$2" ]] ; then
portwine_exe="$(realpath "$2")" portwine_exe="$(realpath "$2")"
elif [[ "$1" == "--debug" ]] && [[ -f "$OLDPWD/$2" ]] && [[ "$2" == *.exe ]] ; then elif [[ "$1" == "--debug" ]] && [[ -f "$OLDPWD/$2" ]] && ([[ "$2" == *.exe ]] || [[ "$2" == *.bat ]]); then
portwine_exe="$(realpath "$OLDPWD/$2")" portwine_exe="$(realpath "$OLDPWD/$2")"
elif [[ "$1" == *.exe ]] ; then elif [[ "$1" == *.exe ]] || [[ "$1" == *.bat ]]; then
portwine_exe="$1" portwine_exe="$1"
MISSING_DESKTOP_FILE=1 MISSING_DESKTOP_FILE=1
fi fi