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

correct and rename func

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-09-28 12:33:48 +03:00
parent d0e28bbd52
commit fb4819da91
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
data_from_portwine/scripts/functions_helper
View File

@ -1291,11 +1291,10 @@ 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 case "$1" in
restart_pp --restart) restart_pp ;;
else *) exit 0 ;;
exit 0 esac
fi
} }
export -f stop_portwine export -f stop_portwine
@ -1963,7 +1962,7 @@ pw_check_command () {
} }
export -f pw_check_command export -f pw_check_command
pw_skip_update () { pw_get_tmp_files () {
for f_cmd in "gamescope --help" "lspci -k" "xrandr --current" "locale -a" for f_cmd in "gamescope --help" "lspci -k" "xrandr --current" "locale -a"
do pw_check_command "$f_cmd" do pw_check_command "$f_cmd"
done done
@ -1975,9 +1974,9 @@ pw_skip_update () {
fi fi
} }
pw_skip_update_new () { pw_skip_get_info () {
if [[ "${SKIP_CHECK_UPDATES_NEW}" != "1" ]] ; then if [[ "${SKIP_CHECK_UPDATES_NEW}" != "1" ]] ; then
background_pid --end "pw_skip_update" "1" background_pid --end "pw_get_tmp_files" "1"
if [[ -f "${PW_TMPFS_PATH}/gamescope.tmp" ]] ; then if [[ -f "${PW_TMPFS_PATH}/gamescope.tmp" ]] ; then
export GAMESCOPE_INSTALLED="1" export GAMESCOPE_INSTALLED="1"
@ -2224,7 +2223,7 @@ pw_create_unique_exe () {
} }
start_portwine () { start_portwine () {
pw_skip_update_new pw_skip_get_info
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
@ -3490,7 +3489,7 @@ export -f pw_run
pw_yad_set_form () { pw_yad_set_form () {
if [[ $(<"${PW_TMPFS_PATH}/tmp_yad_form") != "" ]] ; then if [[ $(<"${PW_TMPFS_PATH}/tmp_yad_form") != "" ]] ; then
pw_skip_update_new pw_skip_get_info
PW_YAD_SET=$(head -n 1 "${PW_TMPFS_PATH}/tmp_yad_form" | awk '{print $1}') PW_YAD_SET=$(head -n 1 "${PW_TMPFS_PATH}/tmp_yad_form" | awk '{print $1}')
export PW_YAD_SET export PW_YAD_SET
fi fi
@ -3551,15 +3550,13 @@ 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 --restart
stop_portwine
} }
pw_winefile () { pw_winefile () {
start_portwine start_portwine
pw_run winefile pw_run winefile
export PW_STOP_PORTWINE_RESTART=1 stop_portwine --restart
stop_portwine
} }
pw_winecmd () { pw_winecmd () {
@ -3567,16 +3564,14 @@ 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 --restart
stop_portwine
} }
pw_winereg () { 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 --restart
stop_portwine
} }
pw_start_cont_xterm () { pw_start_cont_xterm () {
@ -5580,7 +5575,7 @@ pw_prefix_manager () {
} }
portwine_start_debug () { portwine_start_debug () {
pw_skip_update_new pw_skip_get_info
kill_portwine kill_portwine
export PW_LOG=1 export PW_LOG=1
if [[ -z "$VULKAN_DRIVER_NAME" ]] || [[ "$VULKAN_DRIVER_NAME" == "llvmpipe" ]] ; then if [[ -z "$VULKAN_DRIVER_NAME" ]] || [[ "$VULKAN_DRIVER_NAME" == "llvmpipe" ]] ; then

4
data_from_portwine/scripts/start.sh
View File

@ -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 PW_STOP_PORTWINE_RESTART unset PW_DESKTOP_FILES_REGEX
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}*
@ -267,7 +267,7 @@ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
PW_FILESYSTEM=$(stat -f -c %T "${PORT_WINE_PATH}") PW_FILESYSTEM=$(stat -f -c %T "${PORT_WINE_PATH}")
export PW_FILESYSTEM export PW_FILESYSTEM
background_pid --start "pw_skip_update" "1" background_pid --start "pw_get_tmp_files" "1"
fi fi
# create lock file # create lock file