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

Merge branch 'Htylol-added-unset' into devel

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-09-16 20:26:03 +03:00
commit b6a50b90f5
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
data_from_portwine/scripts/functions_helper
View File

@ -825,11 +825,12 @@ pw_init_runtime () {
then then
export PW_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32" export PW_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32"
export PW_VK_LAYER_PATH="${PW_PLUGINS_PATH}/portable/share/vulkan/implicit_layer.d" export PW_VK_LAYER_PATH="${PW_PLUGINS_PATH}/portable/share/vulkan/implicit_layer.d"
if check_flatpak \ if check_flatpak
&& check_gamescope_session then
then PW_TERM="xterm -fullscreen -bg black -fg white -e" if check_gamescope_session
elif check_flatpak then PW_TERM="xterm -fullscreen -bg black -fg white -e"
then PW_TERM="xterm -bg black -fg white -e" else PW_TERM="xterm -bg black -fg white -e"
fi
else PW_TERM="env LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\" ${PW_PLUGINS_PATH}/portable/bin/xterm -bg black -fg white -e" else PW_TERM="env LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\" ${PW_PLUGINS_PATH}/portable/bin/xterm -bg black -fg white -e"
fi fi
export PW_TERM export PW_TERM
@ -1394,7 +1395,7 @@ check_dirs_and_files_in_pfx () {
mount_name=$(lsblk -no pkname "$mount_point" 2>/dev/null) mount_name=$(lsblk -no pkname "$mount_point" 2>/dev/null)
if [[ ! -L "$drive_path" ]] ; then if [[ ! -L "$drive_path" ]] ; then
if [[ $(cat "/sys/class/block/$mount_name/removable") != "1" ]] 2>/dev/null ; then if [[ $(<"/sys/class/block/$mount_name/removable") != "1" ]] 2>/dev/null ; then
if [[ ! $(echo "$mount_point" | grep "mmc") ]] 2>/dev/null ; then if [[ ! $(echo "$mount_point" | grep "mmc") ]] 2>/dev/null ; then
ln -sf "$drive_dir" "$drive_path" ln -sf "$drive_dir" "$drive_path"
print_info "Mounted ${drive_dir} to ${drive_path}" print_info "Mounted ${drive_dir} to ${drive_path}"
@ -2902,7 +2903,7 @@ start_portwine () {
if [[ -d /sys/bus/pci/drivers/amdgpu ]] ; then if [[ -d /sys/bus/pci/drivers/amdgpu ]] ; then
export RADV_DEBUG+="nodcc " export RADV_DEBUG+="nodcc "
export AMD_DEBUG="nodcc" export AMD_DEBUG="nodcc"
if [[ ! "$(cat "${PW_TMPFS_PATH}/vulkaninfo.tmp" | grep -i VK_EXT_image_drm_format_modifier)" ]] ; then if [[ ! "$(grep -i VK_EXT_image_drm_format_modifier "${PW_TMPFS_PATH}/vulkaninfo.tmp")" ]] ; then
export R600_DEBUG="nodcc" export R600_DEBUG="nodcc"
grep -e '--backend' "${PW_TMPFS_PATH}/gamescope.tmp" &>/dev/null && PW_GS_BACKEND_SDL="1" grep -e '--backend' "${PW_TMPFS_PATH}/gamescope.tmp" &>/dev/null && PW_GS_BACKEND_SDL="1"
fi fi
@ -2915,8 +2916,8 @@ start_portwine () {
&& ! check_gamescope_session && ! check_gamescope_session
then then
if [[ "${PW_GPU_USE}" != "disabled" ]] ; then if [[ "${PW_GPU_USE}" != "disabled" ]] ; then
PW_vendorID="$(cat "${PW_TMPFS_PATH}/vulkaninfo.tmp" | grep -B3 "${PW_GPU_USE}" | grep vendorID | sort -u | awk -F'0x' '{print $2}')" PW_vendorID="$(grep -B3 "${PW_GPU_USE}" "${PW_TMPFS_PATH}/vulkaninfo.tmp" | grep vendorID | sort -u | awk -F'0x' '{print $2}')"
PW_deviceID="$(cat "${PW_TMPFS_PATH}/vulkaninfo.tmp" | grep -B3 "${PW_GPU_USE}" | grep deviceID | sort -u | awk -F'0x' '{print $2}')" PW_deviceID="$(grep -B3 "${PW_GPU_USE}" "${PW_TMPFS_PATH}/vulkaninfo.tmp" | grep deviceID | sort -u | awk -F'0x' '{print $2}')"
PW_ID_VIDEO=" --prefer-vk-device ${PW_vendorID}:${PW_deviceID}" PW_ID_VIDEO=" --prefer-vk-device ${PW_vendorID}:${PW_deviceID}"
else else
PW_ID_VIDEO="" PW_ID_VIDEO=""
@ -4066,7 +4067,7 @@ fi
;; ;;
esac esac
YAD_BASALT_SET=$(<"${PW_TMPFS_PATH}/tmp_yad_basalt_set") YAD_BASALT_SET=$(<"${PW_TMPFS_PATH}/tmp_yad_basalt_set")
YAD_CAS_SET=$(cat "${PW_TMPFS_PATH}/tmp_yad_cas_set" | sed s/" "//g) YAD_CAS_SET=$(sed s/" "//g "${PW_TMPFS_PATH}/tmp_yad_cas_set")
INT_COUNT_FX=0 INT_COUNT_FX=0
for read_list_fx in ${YAD_BASALT_SET} ; do for read_list_fx in ${YAD_BASALT_SET} ; do
@ -4536,7 +4537,7 @@ fi
done done
else else
if check_flatpak ; then if check_flatpak ; then
GAMESCOPE_VERSION="$(cat /etc/os-release | grep 'VERSION_ID=')" GAMESCOPE_VERSION="$(grep 'VERSION_ID=' /etc/os-release)"
GAMESCOPE_VERSION="${GAMESCOPE_VERSION//VERSION_ID=/}" GAMESCOPE_VERSION="${GAMESCOPE_VERSION//VERSION_ID=/}"
GAMESCOPE_NEED_INSTALL="$(eval_gettext "<b>Gamescope is not detected on the system, to install it, run the command in the terminal:\n flatpak install -y runtime/org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/\${GAMESCOPE_VERSION}\n (Can be selected and copied)</b>")" GAMESCOPE_NEED_INSTALL="$(eval_gettext "<b>Gamescope is not detected on the system, to install it, run the command in the terminal:\n flatpak install -y runtime/org.freedesktop.Platform.VulkanLayer.gamescope/x86_64/\${GAMESCOPE_VERSION}\n (Can be selected and copied)</b>")"
YAD_TEXT_SELECTION="--selectable-labels" YAD_TEXT_SELECTION="--selectable-labels"

4
data_from_portwine/scripts/start.sh
View File

@ -98,7 +98,7 @@ unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_T
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_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 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_COMMENT_DB unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG
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}*
@ -664,7 +664,7 @@ if [[ -f "${portwine_exe}" ]] ; then
if [[ "${PW_GUI_START}" == "NOTEBOOK" ]] ; then if [[ "${PW_GUI_START}" == "NOTEBOOK" ]] ; then
unset PW_YAD_FORM_TAB unset PW_YAD_FORM_TAB
fi fi
unset PW_NO_RESTART_PPDB PW_DISABLED_CREATE_DB KEY_START portwine_exe unset portwine_exe KEY_START $(sed -n '/export/p' "${PORTWINE_DB_FILE}" | sed 's/\(export\|=.*\| \)//g')
print_info "Restarting..." print_info "Restarting..."
restart_pp restart_pp
;; ;;