Commit 3ff033ab authored by Mikhail Tergoev's avatar Mikhail Tergoev

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

parents c1ad101d 922bc617
...@@ -1857,7 +1857,6 @@ ${PW_PV_OVERRIDES}/i386-linux-gnu/aliases:\ ...@@ -1857,7 +1857,6 @@ ${PW_PV_OVERRIDES}/i386-linux-gnu/aliases:\
for PWRTMRW in "${PW_RT_MOUNT_RW[@]}" ; do for PWRTMRW in "${PW_RT_MOUNT_RW[@]}" ; do
export PRESSURE_VESSEL_FILESYSTEMS_RW="${PRESSURE_VESSEL_FILESYSTEMS_RW:+$PRESSURE_VESSEL_FILESYSTEMS_RW:}${PWRTMRW}" export PRESSURE_VESSEL_FILESYSTEMS_RW="${PRESSURE_VESSEL_FILESYSTEMS_RW:+$PRESSURE_VESSEL_FILESYSTEMS_RW:}${PWRTMRW}"
done done
export PW_TERM="env LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\" ${PW_PLUGINS_PATH}/portable/bin/xterm -bg black -fg white -e" export PW_TERM="env LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\" ${PW_PLUGINS_PATH}/portable/bin/xterm -bg black -fg white -e"
print_info "RUNTIME is enabled" print_info "RUNTIME is enabled"
...@@ -4899,6 +4898,35 @@ steamplay_launch () { ...@@ -4899,6 +4898,35 @@ steamplay_launch () {
fi fi
} }
run_with_after_exe_bat () {
local main_exe after_exe wait_delay wait_delay_int run_after_bat
main_exe="${1}"
after_exe="${2}"
wait_delay="${PW_RUN_AFTER_DELAY:-3}"
wait_delay_int="${wait_delay%%.*}"
[[ "${wait_delay_int}" =~ ^[0-9]+$ ]] || wait_delay_int="3"
run_after_bat="${PW_TMPFS_PATH}/pw_run_after_exe_${PW_PREFIX_NAME:-DEFAULT}_$$.bat"
cat > "${run_after_bat}" <<EOF
@echo off
start "" "z:${main_exe}"
ping -n ${wait_delay_int} 127.0.0.1 >nul
start "" "z:${after_exe}"
EOF
pw_run "${PW_VD_TMP[@]}" cmd /c "z:${run_after_bat}"
try_remove_file "${run_after_bat}"
}
should_run_after_exe () {
[[ -n "${PW_RUN_AFTER_EXE:-}" ]] \
&& [[ -f "${PW_RUN_AFTER_EXE}" ]] \
&& [[ "${PW_RUN_AFTER_EXE}" != "${portwine_exe}" ]] \
&& [[ "${portwine_exe,,}" =~ \.exe$ ]]
}
portwine_launch () { portwine_launch () {
start_portwine start_portwine
unset PW_VD_TMP unset PW_VD_TMP
...@@ -4924,24 +4952,28 @@ portwine_launch () { ...@@ -4924,24 +4952,28 @@ portwine_launch () {
fi fi
done done
else else
case "${portwine_exe,,}" in if should_run_after_exe ; then
*.exe) run_with_after_exe_bat "${portwine_exe}" "${PW_RUN_AFTER_EXE}"
pw_run "${PW_VD_TMP[@]}" ${WINE_WIN_START} "$portwine_exe" else
;; case "${portwine_exe,,}" in
*.bat) *.exe)
PW_USE_TERMINAL=1 pw_run "${PW_VD_TMP[@]}" ${WINE_WIN_START} "${portwine_exe}"
pw_run "${PW_VD_TMP[@]}" "$portwine_exe" ;;
;; *.bat)
*.msi) PW_USE_TERMINAL=1
pw_run "${PW_VD_TMP[@]}" msiexec /i "$portwine_exe" pw_run "${PW_VD_TMP[@]}" "${portwine_exe}"
;; ;;
*.reg) *.msi)
pw_run "${PW_VD_TMP[@]}" regedit "$portwine_exe" pw_run "${PW_VD_TMP[@]}" msiexec /i "${portwine_exe}"
;; ;;
*) *.reg)
pw_run "${PW_VD_TMP[@]}" winefile pw_run "${PW_VD_TMP[@]}" regedit "${portwine_exe}"
;; ;;
esac *)
pw_run "${PW_VD_TMP[@]}" winefile
;;
esac
fi
fi fi
} }
......
...@@ -143,6 +143,7 @@ unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER ...@@ -143,6 +143,7 @@ unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER
unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_NO_AUTO_CREATE_SHORTCUT unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_NO_AUTO_CREATE_SHORTCUT
unset PW_TERM PW_EXEC_FROM_DESKTOP WEBKIT_DISABLE_DMABUF_RENDERER PW_VK_ICD_FILENAMES PW_USE_SETUP_FILE MANGOHUD_CONFIGFILE unset PW_TERM PW_EXEC_FROM_DESKTOP WEBKIT_DISABLE_DMABUF_RENDERER PW_VK_ICD_FILENAMES PW_USE_SETUP_FILE MANGOHUD_CONFIGFILE
unset LAUNCH_PARAMETERS unset LAUNCH_PARAMETERS
unset PW_RUN_AFTER_EXE PW_RUN_AFTER_DELAY
echo "" > "${PW_TMPFS_PATH}/tmp_yad_form" echo "" > "${PW_TMPFS_PATH}/tmp_yad_form"
echo "" > "${PW_TMPFS_PATH}/tmp_yad_form_vulkan" echo "" > "${PW_TMPFS_PATH}/tmp_yad_form_vulkan"
......
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