Commit 2b5a06ba authored by Mikhail Tergoev's avatar Mikhail Tergoev

Merge branch 'reg' of github.com:Boria138/PortWINE into Boria138-reg

parents db0b9986 56cf101c
......@@ -3071,17 +3071,26 @@ pw_yad_form_vulkan () {
portwine_launch () {
start_portwine
PORTWINE_MSI=$(basename "${portwine_exe}" | grep .msi)
PORTWINE_BAT=$(basename "${portwine_exe}" | grep .bat)
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"
elif [ ! -z "${PORTWINE_MSI}" ]; then
fi
case "$portwine_exe" in
*.bat)
PW_USE_TERMINAL=1
pw_run cmd /c "$portwine_exe"
;;
*.msi)
pw_run msiexec /i "$portwine_exe"
elif [[ ! -z "${PORTWINE_BAT}" || -n "${portwine_exe}" ]] ; then
pw_run ${WINE_WIN_START} "$portwine_exe"
else
;;
*.reg)
pw_run regedit "$portwine_exe"
;;
*)
pw_run winefile
fi
;;
esac
}
pw_winecfg () {
......
......@@ -36,13 +36,13 @@ if [[ "$1" == *.ppack ]] ; then
portwine_exe="$1"
elif [[ -f "$1" ]] ; then
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")"
elif [[ "$1" == "--debug" ]] && [[ -f "$2" ]] ; then
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")"
elif [[ "$1" == *.exe ]] ; then
elif [[ "$1" == *.exe ]] || [[ "$1" == *.bat ]]; then
portwine_exe="$1"
MISSING_DESKTOP_FILE=1
fi
......
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