Added PW_STOP_PORTWINE_RESTART
This commit is contained in:
parent
c81c93a253
commit
4bee332d40
@ -1266,7 +1266,11 @@ stop_portwine () {
|
|||||||
pw_auto_create_shortcut
|
pw_auto_create_shortcut
|
||||||
add_in_stop_portwine
|
add_in_stop_portwine
|
||||||
unset SKIP_CHECK_UPDATES
|
unset SKIP_CHECK_UPDATES
|
||||||
|
if [[ "$PW_STOP_PORTWINE_RESTART" == 1 ]] ; then
|
||||||
|
restart_pp
|
||||||
|
else
|
||||||
exit 0
|
exit 0
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
export -f stop_portwine
|
export -f stop_portwine
|
||||||
|
|
||||||
@ -2199,6 +2203,7 @@ pw_create_unique_exe () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
start_portwine () {
|
start_portwine () {
|
||||||
|
pw_skip_update_new
|
||||||
if [[ "${PW_LOCALE_SELECT}" != "disabled" ]] && [[ -n "${PW_LOCALE_SELECT}" ]] ; then
|
if [[ "${PW_LOCALE_SELECT}" != "disabled" ]] && [[ -n "${PW_LOCALE_SELECT}" ]] ; then
|
||||||
export LC_ALL="${PW_LOCALE_SELECT}"
|
export LC_ALL="${PW_LOCALE_SELECT}"
|
||||||
if [[ "${PW_USE_RUNTIME}" == "1" ]] && [[ "${HOST_LC_ALL}" != "${LC_ALL}" ]] ; then
|
if [[ "${PW_USE_RUNTIME}" == "1" ]] && [[ "${HOST_LC_ALL}" != "${LC_ALL}" ]] ; then
|
||||||
@ -3495,7 +3500,6 @@ pw_yad_form_vulkan () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
portwine_launch () {
|
portwine_launch () {
|
||||||
pw_skip_update_new
|
|
||||||
start_portwine
|
start_portwine
|
||||||
unset PW_VD_TMP
|
unset PW_VD_TMP
|
||||||
if [[ "${PW_VIRTUAL_DESKTOP}" == "1" ]] ; then
|
if [[ "${PW_VIRTUAL_DESKTOP}" == "1" ]] ; then
|
||||||
@ -3526,11 +3530,15 @@ pw_winecfg () {
|
|||||||
start_portwine
|
start_portwine
|
||||||
export GST_PLUGIN_SYSTEM_PATH_1_0=""
|
export GST_PLUGIN_SYSTEM_PATH_1_0=""
|
||||||
pw_run winecfg
|
pw_run winecfg
|
||||||
|
export PW_STOP_PORTWINE_RESTART=1
|
||||||
|
stop_portwine
|
||||||
}
|
}
|
||||||
|
|
||||||
pw_winefile () {
|
pw_winefile () {
|
||||||
start_portwine
|
start_portwine
|
||||||
pw_run winefile
|
pw_run winefile
|
||||||
|
export PW_STOP_PORTWINE_RESTART=1
|
||||||
|
stop_portwine
|
||||||
}
|
}
|
||||||
|
|
||||||
pw_winecmd () {
|
pw_winecmd () {
|
||||||
@ -3538,6 +3546,7 @@ pw_winecmd () {
|
|||||||
start_portwine
|
start_portwine
|
||||||
cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c" || fatal
|
cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c" || fatal
|
||||||
pw_run cmd
|
pw_run cmd
|
||||||
|
export PW_STOP_PORTWINE_RESTART=1
|
||||||
stop_portwine
|
stop_portwine
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3545,6 +3554,8 @@ pw_winereg () {
|
|||||||
start_portwine
|
start_portwine
|
||||||
export GST_PLUGIN_SYSTEM_PATH_1_0=""
|
export GST_PLUGIN_SYSTEM_PATH_1_0=""
|
||||||
pw_run regedit
|
pw_run regedit
|
||||||
|
export PW_STOP_PORTWINE_RESTART=1
|
||||||
|
stop_portwine
|
||||||
}
|
}
|
||||||
|
|
||||||
pw_start_cont_xterm () {
|
pw_start_cont_xterm () {
|
||||||
@ -3558,6 +3569,7 @@ pw_start_cont_xterm () {
|
|||||||
${PW_GAMEMODERUN_SLR} \
|
${PW_GAMEMODERUN_SLR} \
|
||||||
${PW_MANGOHUD_SLR} \
|
${PW_MANGOHUD_SLR} \
|
||||||
${PW_TERM} bash
|
${PW_TERM} bash
|
||||||
|
restart_pp
|
||||||
}
|
}
|
||||||
|
|
||||||
# GUI INFO
|
# GUI INFO
|
||||||
|
@ -102,7 +102,7 @@ unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME
|
|||||||
unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
|
unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
|
||||||
unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
|
unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
|
||||||
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_DESKTOP_FILES_REGEX
|
unset PW_DESKTOP_FILES_REGEX PW_STOP_PORTWINE_RESTART
|
||||||
|
|
||||||
export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
|
export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
|
||||||
rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*
|
rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*
|
||||||
@ -660,7 +660,6 @@ else
|
|||||||
fi
|
fi
|
||||||
PW_GENERATE_BUTTONS+="--field= $(print_wrapped "${PW_DESKTOP_FILES_SHOW//".desktop"/""}" "25" "...")!${PW_NAME_D_ICON_48}.png!:FBTN%@bash -c \"button_click --desktop "${PW_DESKTOP_FILES// /#@_@#}"\"%"
|
PW_GENERATE_BUTTONS+="--field= $(print_wrapped "${PW_DESKTOP_FILES_SHOW//".desktop"/""}" "25" "...")!${PW_NAME_D_ICON_48}.png!:FBTN%@bash -c \"button_click --desktop "${PW_DESKTOP_FILES// /#@_@#}"\"%"
|
||||||
done
|
done
|
||||||
IFS="$orig_IFS"
|
|
||||||
|
|
||||||
IFS="%"
|
IFS="%"
|
||||||
"${pw_yad}" --plug=$KEY_MENU --tabnum="${PW_GUI_SORT_TABS[4]}" --form --columns="$MAIN_GUI_COLUMNS" --homogeneous-column \
|
"${pw_yad}" --plug=$KEY_MENU --tabnum="${PW_GUI_SORT_TABS[4]}" --form --columns="$MAIN_GUI_COLUMNS" --homogeneous-column \
|
||||||
@ -813,7 +812,7 @@ fi
|
|||||||
gui_pw_reinstall_pp|open_changelog|\
|
gui_pw_reinstall_pp|open_changelog|\
|
||||||
128|gui_pw_update|\
|
128|gui_pw_update|\
|
||||||
change_loc|gui_open_scripts_from_backup|\
|
change_loc|gui_open_scripts_from_backup|\
|
||||||
gui_credits)
|
gui_credits|pw_start_cont_xterm)
|
||||||
if [[ -z "${PW_ALL_DF}" ]] ; then
|
if [[ -z "${PW_ALL_DF}" ]] ; then
|
||||||
export TAB_MAIN_MENU="4"
|
export TAB_MAIN_MENU="4"
|
||||||
else
|
else
|
||||||
@ -822,7 +821,8 @@ fi
|
|||||||
;;
|
;;
|
||||||
gui_proton_downloader|WINETRICKS|\
|
gui_proton_downloader|WINETRICKS|\
|
||||||
116|pw_create_prefix_backup|\
|
116|pw_create_prefix_backup|\
|
||||||
gui_clear_pfx)
|
gui_clear_pfx|WINEREG|WINECMD|\
|
||||||
|
WINEFILE|WINECFG)
|
||||||
if [[ -z "${PW_ALL_DF}" ]] ; then
|
if [[ -z "${PW_ALL_DF}" ]] ; then
|
||||||
export TAB_MAIN_MENU="3"
|
export TAB_MAIN_MENU="3"
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user