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

Merge branch 'master' into added-main-menu

Browse Source
This commit is contained in:
Vladislav
2024-07-12 10:19:04 +05:00
committed by GitHub
parent 8c5467924b 154f0e17db
commit cf41b7be3f
7 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
data_from_portwine/scripts/functions_helper
View File

@@ -858,7 +858,7 @@ export -f kill_portwine
pw_kill_autostart () {
if [[ -z "${2}" ]]
then SWAIT=5
then SWAIT=3
else SWAIT="${2}"
fi
sleep 5
@@ -1275,13 +1275,17 @@ pw_init_db () {
elif [[ $(echo "$PW_FIND_DB_FILE" | wc -l) -eq 1 ]] ; then
PORTWINE_DB_FILE="${PW_FIND_DB_FILE}"
fi
IFS="$orig_IFS"
if [[ -f "${PW_FIND_DB_FILE}" ]] && [[ -z $(grep "^export PW_DISABLED_CREATE_DB=1" "${PW_FIND_DB_FILE}") ]] ; then
if [[ -f "${PW_FIND_DB_FILE}" ]] \
&& [[ "${PW_DISABLED_CREATE_DB}" != 1 ]] \
&& [[ -z $(grep "^export PW_DISABLED_CREATE_DB=1" "${PW_FIND_DB_FILE}") ]]
then
try_copy_file "${PW_FIND_DB_FILE}" "${portwine_exe}".ppdb
PORTWINE_DB_FILE="${portwine_exe}".ppdb
fi
if [[ ! -z $(echo "${portwine_exe}" | grep "/data/prefixes/") ]] && \
[[ -z $(echo "${portwine_exe}" | grep "/data/prefixes/DEFAULT/") ]]
if [[ ! -z $(echo "${portwine_exe}" | grep "/data/prefixes/") ]] \
&& [[ -z $(echo "${portwine_exe}" | grep "/data/prefixes/DEFAULT/") ]]
then
PW_PREFIX_NAME=$(echo "${portwine_exe}" | awk -F"/prefixes/" '{print $2}' | awk -F"/" '{print $1}')
fi
@@ -1464,6 +1468,10 @@ update_winetricks () {
}
edit_db_from_gui () {
if [[ "${PW_DISABLED_CREATE_DB}" == 1 ]] ; then
print_warning "Skipped edit_db_from_gui"
return 0
fi
print_info "edit_db_from_gui PORTWINE_DB_FILE=$PORTWINE_DB_FILE"
if [[ ! -z "$PORTWINE_DB_FILE" ]] \
&& [[ -f "$PORTWINE_DB_FILE" ]]
@@ -1501,7 +1509,9 @@ edit_user_conf_from_gui () {
}
pw_create_gui_png () {
if [[ -z "$PORTPROTON_NAME" ]] ; then
if [[ -z "$PORTPROTON_NAME" ]] \
|| [[ "$PW_NO_RESTART_PPDB" == "1" ]]
then
if [[ ! -z "${PORTWINE_CREATE_SHORTCUT_NAME}" ]] ; then
PORTPROTON_NAME="${PORTWINE_CREATE_SHORTCUT_NAME}"
else
@@ -4637,6 +4647,9 @@ portwine_create_shortcut () {
[[ ! -e ${portwine_exe} ]] && return 1
pw_create_gui_png
print_error "portwine_exe: $portwine_exe"
print_error "PORTPROTON_NAME: ${PORTPROTON_NAME}"
if [[ "$1" == "block_name" ]] ; then
export name_desktop="${PORTPROTON_NAME}"
OUTPUT=$("${pw_yad}" --title="$(gettext "Choices")" --form \
@@ -4749,7 +4762,7 @@ portwine_create_shortcut () {
unset PW_SKIP_RESTART_STEAM
fi
if [[ "$PW_NO_RESTART" != "1" ]] ; then
if [[ "$PW_NO_RESTART_PPDB" != "1" ]] ; then
print_info "Restarting PP..."
export SKIP_CHECK_UPDATES=1
/usr/bin/env bash -c ${pw_full_command_line[*]} &

2
data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY
View File

@@ -11,7 +11,7 @@ start_portwine
if try_download "https://ys-api-os.mihoyo.com/event/download_porter/link/ys_global/genshinimpactpc/default" "${PW_AUTOINSTALL_EXE}" no_mirror
then
pw_start_progress_bar_block "Installing HoYoPlay Launcher."
pw_kill_autostart launcher.exe &
pw_kill_autostart HYP.exe &
export PATH_TO_GAME="${PW_USER_TEMP}"
pw_run "${PW_AUTOINSTALL_EXE}"
export portwine_exe="$WINEPREFIX/drive_c/Program Files/HoYoPlay/launcher.exe"

2
data_from_portwine/scripts/pw_autoinstall/PW_WOSB
View File

@@ -20,7 +20,7 @@ then
portwine_exe="$WINEPREFIX/drive_c/WoSB/launcher.exe"
pw_stop_progress_bar
export PW_NO_RESTART="1"
export PW_NO_RESTART_PPDB="1"
if [[ "$LANGUAGE" == "ru" ]] ; then
export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle RU"
pw_create_unique_exe "wosb_launcher_ru"

11
data_from_portwine/scripts/start.sh
View File

@@ -27,7 +27,11 @@ export pw_full_command_line=("$0" $*)
MISSING_DESKTOP_FILE=0
if [[ -f "$1" ]] ; then
if [[ "$1" == *.ppack ]] ; then
export PW_NO_RESTART_PPDB="1"
export PW_DISABLED_CREATE_DB="1"
portwine_exe="$1"
elif [[ -f "$1" ]] ; then
portwine_exe="$(realpath "$1")"
elif [[ -f "$OLDPWD/$1" ]] && [[ "$1" == *.exe ]] ; then
portwine_exe="$(realpath "$OLDPWD/$1")"
@@ -72,7 +76,7 @@ else
fi
unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET PW_ICON_FOR_YAD
unset PW_CHECK_AUTOINSTALL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB RADV_PERFTEST
unset PW_CHECK_AUTOINSTALL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE RADV_PERFTEST
unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PW_PATH
unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY
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
@@ -324,9 +328,8 @@ EOF
if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.create_shortcut" ]] ; then
while IFS= read -r line
do
export PW_NO_RESTART="1"
export portwine_exe="$PORT_WINE_PATH/data/prefixes/$PW_PREFIX_NAME/$line"
portwine_create_shortcut "$PORT_WINE_PATH/data/prefixes/$PW_PREFIX_NAME/$line"
portwine_create_shortcut
done < "$PORT_WINE_PATH/data/prefixes/$PW_PREFIX_NAME/.create_shortcut"
fi
yad_info "$(gettext "Unpack is DONE for prefix:") <b>\"${PW_PREFIX_NAME}\"</b>."

2
data_from_portwine/scripts/var
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2313
#SCRIPTS_NEXT_VERSION=2314
########################################################################
export LANGUAGES_LIST="ru es"
export PW_VKBASALT="0"