diff --git a/LICENSE b/LICENSE index 0d1f2737..c3d4f46f 100755 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 Castro-Fidel (linux-gaming.ru) +Copyright (c) 2025 Castro-Fidel (linux-gaming.ru) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 82c56c4c..fa4bdf20 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,28 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2388### / stable / Date: 04.02.2025 / Download update size: 10 megabytes +* cumulative update to the stable version of PortProton scripts + +###Scripts version 2387### / Date: 04.02.2025 / Download update size: 10 megabytes +* updated versions: + * DXVK_GIT "2.5.3-31" (shared with dxvk-nvapi) + * VKD3D_GIT "1.1-4367" (shared with vkd3d-shader) +* added the ability to replace WINEDEBUG variable arguments in user.conf or .ppdb settings files. +* improved icon creation functions (thanks to Htylol) +* added Steam Play support for games supported via PortProton and the selected Proton version on Steam (thanks to alex2844) +* fixed windows operation, paths in game launch arguments (thanks to Boria138) +* fixed errors with empty "dist" directory + +###Scripts version 2386### / Date: 09.01.2025 / Download update size: 4 megabytes +* corrected permissions when creating desktop files (thanks to Boria138) +* fixed the function of rolling back scripts from the archive if there is no scripts_backup directory (thanks to Boria138) +* added the ability to remove a game from the list in the Steam library using the functionality of changing the shortcut in PortProton (thanks to alex2844) +* when adding a game to the steam library, a check for the availability of the steamgriddb site has been added (thanks alex2844) +* added auto-installation of games (thanks to minergenon): + * Last Chaos + * Fractured Online + ###Scripts version 2385### / stable / Date: 29.12.2024 / Download update size: 195 megabytes * cumulative update to the stable version of PortProton scripts diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 8c9343f3..22756084 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,28 @@ ----------------------------------------- История изменений: +###Scripts version 2388### / stable / Дата: 04.02.2025 / Размер скачиваемого обновления: 10 мегабайт +* кумулятивное обновление стабильной версии скриптов PortProton + +###Scripts version 2387### / Дата: 04.02.2025 / Размер скачиваемого обновления: 10 мегабайт +* обновлены версии: + * DXVK_GIT "2.5.3-31" (совместно с dxvk-nvapi) + * VKD3D_GIT "1.1-4367" (совместно vkd3d-shader) +* добавлена возможность замещения аргументов переменной WINEDEBUG в user.conf или .ppdb файлах настроек +* улучшение функций создания иконок (спасибо Htylol) +* добавлена поддержка Steam Play для игр установленных с помощью PortProton и когда выбрана версия proton в steam (спасибо alex2844) +* исправлена работа windows путей в аргументах запуска к игре (спасибо Boria138) +* исправлены ошибки при пустом каталоге "dist" + +###Scripts version 2386### / Дата: 09.01.2025 / Размер скачиваемого обновления: 4 мегабайта +* исправление прав при создании desktop файлов (спасибо Boria138) +* исправлена функция отката скриптов из архива, если нет каталога scripts_backup (спасибо Boria138) +* добавлена возможность удаления игры из списка в библиотеке Steam с помощью функционала изменения ярлыка в PortProton (спасибо alex2844) +* при добавлении игры в библиотеку steam добавлена проверка на доступность сайта steamgriddb (спасибо alex2844) +* добавлены автоустановки игр (спасибо minergenon): + * Last Chaos + * Fractured Online + ###Scripts version 2385### / stable / Дата: 29.12.2024 / Размер скачиваемого обновления: 195 мегабайт * кумулятивное обновление стабильной версии скриптов PortProton diff --git a/data_from_portwine/img/gui/fracturedonline.png b/data_from_portwine/img/gui/fracturedonline.png new file mode 100644 index 00000000..f214cb90 Binary files /dev/null and b/data_from_portwine/img/gui/fracturedonline.png differ diff --git a/data_from_portwine/img/gui/lastchaos.png b/data_from_portwine/img/gui/lastchaos.png new file mode 100644 index 00000000..3960bf4f Binary files /dev/null and b/data_from_portwine/img/gui/lastchaos.png differ diff --git a/data_from_portwine/scripts/add_in_steam.sh b/data_from_portwine/scripts/add_in_steam.sh index 717da97a..d0137db9 100755 --- a/data_from_portwine/scripts/add_in_steam.sh +++ b/data_from_portwine/scripts/add_in_steam.sh @@ -41,19 +41,22 @@ generateShortcutVDFHexAppId() { } # Takes an signed 32bit integer and converts it to an unsigned 32bit integer -generateShortcutGridAppId() { +extractSteamId32() { +# STUID32=$((STUID64 - 76561197960265728)) echo $(($1 & 0xFFFFFFFF)) } ## ---------- ### END MAGIC APPID FUNCTIONS getSteamShortcutsVdfFileHex() { - STCFGPATH="$(getUserPath)" - if [[ -n "${STCFGPATH}" ]]; then + if [[ -z "${STCFGPATH}" ]]; then + STCFGPATH="$(getUserPath)" + fi + if [[ -n "${STCFGPATH}" ]] && [[ -z "${SCPATH}" ]]; then SCPATH="${STCFGPATH}/shortcuts.vdf" - if [[ -f "${SCPATH}" ]]; then - LC_ALL=C perl -0777 -ne 'print unpack("H*", $_)' "${SCPATH}" - fi + fi + if [[ -n "${SCPATH}" ]] && [[ -f "${SCPATH}" ]]; then + LC_ALL=C perl -0777 -ne 'print unpack("H*", $_)' "${SCPATH}" fi } @@ -71,10 +74,14 @@ getSteamShortcutEntryHex() { printf "%s" "${SHORTCUTSVDFINPUTHEX}" | grep -oP "${SHORTCUTSVDFMATCHPATTERN}\K.*?(?=${SHORTCUTVDFENDPAT})" } +getAppExe() { + [[ -n "$1" ]] && listNonSteamGames | jq -r --arg id "$1" 'map(select(.id == $id)) | first(.[].exe)' +} + getAppTarget() { - exe=$(listNonSteamGames | jq -r --arg id "$1" 'map(select(.id == $id)) | first(.[].exe)') + exe=$(getAppExe "$1") if [[ -n "${exe}" ]]; then - if [[ "${exe}" =~ .sh$ ]] ; then + if [[ "${exe}" =~ .sh$ ]]; then parseSteamTargetExe "${exe}" else echo "${exe}"; @@ -87,7 +94,7 @@ getSteamGameId() { } getAppId() { - listNonSteamGames | jq -r --arg exe "$1" 'map(select(.exe == $exe)) | first(.[]?.id)' + [[ -n "$1" ]] && listNonSteamGames | jq -r --arg exe "$1" 'map(select(.exe == $exe)) | first(.[]?.id)' } getSteamId() { @@ -100,14 +107,16 @@ getSteamId() { if [[ -n "${SteamIds:-}" ]] && jq -e --arg key "$NOSTAPPNAME" 'has($key)' <<< "${SteamIds}" > /dev/null; then SteamAppId=$(jq -r --arg key "${NOSTAPPNAME}" '.[$key]' <<< "${SteamIds}") else - if [[ -n "${1:-}" ]]; then + if [[ -n "${1:-}" ]] && [[ "${USE_STEABGRIDDB:-1}" == "1" ]]; then getSteamGridDBId "${NOSTAPPNAME}" > /dev/null fi if [[ $SteamGridDBTypeSteam == true ]]; then - SRES=$(curl -Ls -e "https://www.steamgriddb.com/game/${SteamGridDBId}" "https://www.steamgriddb.com/api/public/game/${SteamGridDBId}") + SRES=$(curl -Ls --connect-timeout 5 -m 10 -e "https://www.steamgriddb.com/game/${SteamGridDBId}" "https://www.steamgriddb.com/api/public/game/${SteamGridDBId}") if jq -e ".success == true" <<< "${SRES}" > /dev/null 2>&1; then SteamAppId="$(jq -r '.data.platforms.steam.id' <<< "${SRES}")" fi + elif [[ "${USE_STEABGRIDDB:-1}" == "0" ]]; then + SteamAppId="$(curl -s --connect-timeout 5 -m 10 "https://api.steampowered.com/ISteamApps/GetAppList/v2/" | jq --arg name "${NOSTAPPNAME}" '.applist.apps[] | select(.name == $name) | .appid')" fi SteamIds=$(jq --arg key "${NOSTAPPNAME}" --arg value "${SteamAppId:-}" '. + {($key): $value}' <<< "${SteamIds:-$(jq -n '{}')}") echo "${SteamIds}" > "${cache_file}" @@ -120,41 +129,70 @@ getSteamId() { getSteamGridDBId() { unset SteamGridDBId NOSTAPPNAME="$1" - SGDBRES=$(curl -Ls -H "Authorization: Bearer ${SGDBAPIKEY}" "${BASESTEAMGRIDDBAPI}/search/autocomplete/${NOSTAPPNAME// /_}") - if jq -e ".success == true and (.data | length > 0)" <<< "${SGDBRES}" > /dev/null 2>&1; then - if jq -e '.data[0].types | contains(["steam"])' <<< "${SGDBRES}" > /dev/null; then - SteamGridDBTypeSteam=true - else - SteamGridDBTypeSteam=false + if [[ "${USE_STEABGRIDDB:-1}" == "1" ]] && [[ -n "${SGDBAPIKEY}" ]] && [[ -n "${BASESTEAMGRIDDBAPI}" ]] && curl -fs --connect-timeout 5 -m 10 -o /dev/null "${BASESTEAMGRIDDBAPI}"; then + SGDBRES=$(curl -Ls --connect-timeout 5 -m 10 -H "Authorization: Bearer ${SGDBAPIKEY}" "${BASESTEAMGRIDDBAPI}/search/autocomplete/${NOSTAPPNAME// /_}") + if jq -e ".success == true and (.data | length > 0)" <<< "${SGDBRES}" > /dev/null 2>&1; then + if jq -e '.data[0].types | contains(["steam"])' <<< "${SGDBRES}" > /dev/null; then + SteamGridDBTypeSteam=true + else + SteamGridDBTypeSteam=false + fi + SteamGridDBId="$(jq '.data[0].id' <<< "${SGDBRES}")" + echo "${SteamGridDBId}" fi - SteamGridDBId="$(jq '.data[0].id' <<< "${SGDBRES}")" - echo "${SteamGridDBId}" + else + USE_STEABGRIDDB="0" fi } -getUserPath() { +getUserIds() { + SLUF="${HOME}/.local/share/Steam/config/loginusers.vdf" + if [[ -f "${SLUF}" ]]; then + STUIDS=() + while read -r line; do + if [[ "${line}" =~ ^[[:space:]]*\"([0-9]+)\"$ ]]; then + STUIDS+=("$(extractSteamId32 "${BASH_REMATCH[1]}")") + fi + done < "${SLUF}" + if [[ ${#STUIDS[@]} -gt 0 ]]; then + echo "${STUIDS[@]}" + fi + fi +} + +getUserId() { SLUF="${HOME}/.local/share/Steam/config/loginusers.vdf" if [[ -f "${SLUF}" ]]; then SLUFUB=false - STUID64="" + STUID="" while read -r line; do if [[ "${line}" =~ ^[[:space:]]*\"([0-9]+)\"$ ]]; then STUIDCUR="${BASH_REMATCH[1]}" SLUFUB=true elif [[ "${line}" == *'"MostRecent"'*'"1"' && ${SLUFUB} = true ]]; then - STUID64="${STUIDCUR}" + STUID=$(extractSteamId32 "${STUIDCUR}") break elif [[ "${line}" == "}" ]]; then SLUFUB=false fi done < "${SLUF}" - if [ -n "${STUID64}" ]; then - STUID32=$((STUID64 - 76561197960265728)) - STUIDPATH="${HOME}/.local/share/Steam/userdata/${STUID32}" - if [[ -d "${STUIDPATH}" ]]; then - if [[ -f "${STUIDPATH}/config/shortcuts.vdf" ]]; then - echo "${STUIDPATH}/config" - fi + fi + if [ -n "${STUID}" ]; then + echo "${STUID}" + fi +} + +getUserPath() { + if [[ -n "${1:-}" ]]; then + STUID="$1" + else + STUID="$(getUserId)" + fi + if [ -n "${STUID}" ]; then + STUIDPATH="${HOME}/.local/share/Steam/userdata/${STUID}" + if [[ -d "${STUIDPATH}" ]]; then + if [[ -f "${STUIDPATH}/config/shortcuts.vdf" ]]; then + echo "${STUIDPATH}/config" fi fi fi @@ -178,19 +216,22 @@ listInstalledSteamGames() { } listNonSteamGames() { - getSteamShortcutHex | while read -r SCVDFE; do - jq -n \ - --arg id "$(parseSteamShortcutEntryAppID "${SCVDFE}")" \ - --arg name "$(parseSteamShortcutEntryAppName "${SCVDFE}")" \ - --arg exe "$(parseSteamShortcutEntryExe "${SCVDFE}")" \ - '{id: $id, name: $name, exe: $exe}' - done | jq -s '.' + getSteamShortcutHex | while read -r SCVDFE; do + jq -n \ + --arg id "$(parseSteamShortcutEntryAppID "${SCVDFE}")" \ + --arg name "$(parseSteamShortcutEntryAppName "${SCVDFE}")" \ + --arg exe "$(parseSteamShortcutEntryExe "${SCVDFE}")" \ + --arg dir "$(parseSteamShortcutEntryStartDir "${SCVDFE}")" \ + --arg icon "$(parseSteamShortcutEntryIcon "${SCVDFE}")" \ + --arg args "$(parseSteamShortcutEntryLaunchOptions "${SCVDFE}")" \ + '{id: $id, name: $name, exe: $exe, dir: $dir, icon: $icon, args: $args}' + done | jq -s '.' } listSteamGames() { ( jq -r 'map({AppId: .id, SteamAppId: .id, SteamGameId: .id, Name: .name}) | .[] | tostring' <<< "$(listInstalledSteamGames)" - jq -r '.[] | tostring' <<< "$(listNonSteamGames)" | while read game; do + jq -r '.[] | tostring' <<< "$(listNonSteamGames)" | while read -r game; do id=$(jq -r '.id' <<< "${game}") name=$(jq -r '.name' <<< "${game}") jq -r \ @@ -208,19 +249,22 @@ convertSteamShortcutAppID() { } convertSteamShortcutHex() { - # printf "%s" "$1" | xxd -r -p | tr -d '\0' LC_ALL=C perl -le 'print pack "H*", $ARGV[0]' "$1" | tr -d '\0' } +convertStringToSteamShortcutHex() { + LC_ALL=C perl -e 'print unpack "H*", "$ARGV[0]" . "\x00"' "$(echo "$1" | tr -cd '[:alpha:]')" +} + parseSteamShortcutEntryHex() { SHORTCUTSVDFINPUTHEX="$1" # The hex block representing the shortcut SHORTCUTSVDFMATCHPATTERN="$2" # The pattern to match against in the block convertSteamShortcutHex "$(getSteamShortcutEntryHex "${SHORTCUTSVDFINPUTHEX}" "${SHORTCUTSVDFMATCHPATTERN}")" } -parseSteamShortcutEntryExe() { - SHORTCUTVDFEXEHEXPAT="000145786500" # 'Exe' ('exe' is 6578650a if we ever need it) - parseSteamShortcutEntryHex "$1" "${SHORTCUTVDFEXEHEXPAT}" | tr -d '"' +parseSteamShortcutEntryAppID() { + SHORTCUTVDFAPPIDHEXPAT="617070696400" # 'appid' + convertSteamShortcutAppID "$(printf "%s" "$1" | grep -oP "${SHORTCUTVDFAPPIDHEXPAT}\K.{8}")" } parseSteamShortcutEntryAppName() { @@ -228,13 +272,28 @@ parseSteamShortcutEntryAppName() { parseSteamShortcutEntryHex "$1" "${SHORTCUTVDFNAMEHEXPAT}" } -parseSteamShortcutEntryAppID() { - SHORTCUTVDFAPPIDHEXPAT="617070696400" # 'appid' - convertSteamShortcutAppID "$(printf "%s" "$1" | grep -oP "${SHORTCUTVDFAPPIDHEXPAT}\K.{8}")" +parseSteamShortcutEntryExe() { + SHORTCUTVDFEXEHEXPAT="000145786500" # 'Exe' ('exe' is 6578650a if we ever need it) + parseSteamShortcutEntryHex "$1" "${SHORTCUTVDFEXEHEXPAT}" | tr -d '"' +} + +parseSteamShortcutEntryStartDir() { + SHORTCUTVDFSTARTDIRHEXPAT="0001537461727444697200" + parseSteamShortcutEntryHex "$1" "${SHORTCUTVDFSTARTDIRHEXPAT}" | tr -d '"' +} + +parseSteamShortcutEntryIcon() { + SHORTCUTVDFICONHEXPAT="000169636f6e00" + parseSteamShortcutEntryHex "$1" "${SHORTCUTVDFICONHEXPAT}" +} + +parseSteamShortcutEntryLaunchOptions() { + SHORTCUTVDFARGHEXPAT="00014c61756e63684f7074696f6e7300" # echo "0001$(convertStringToSteamShortcutHex "LaunchOptions")" + parseSteamShortcutEntryHex "$1" "${SHORTCUTVDFARGHEXPAT}" | tr '\002' '\n' | head -n 1 | tr -d '\000' } parseSteamTargetExe() { - grep -E 'flatpak|start\.sh' "$1" | head -n 1 | awk -F'"' '{print $(NF-1)}' + grep -E '^[^# ]*?(flatpak|start\.sh)' "$1" | head -n 1 | sed 's/ "\$@"//' | awk -F'"' '{print $(NF-1)}' } restartSteam() { @@ -255,7 +314,7 @@ restartSteam() { } downloadImage() { - if ! curl -Lf# -o "${STCFGPATH}/grid/$2" "$1"; then + if ! curl -Lf# --connect-timeout 5 -m 10 -o "${STCFGPATH}/grid/$2" "$1"; then return 1 fi } @@ -272,109 +331,167 @@ downloadImageSteam() { } downloadImageSteamGridDB() { - SGDBIMGAPI="${BASESTEAMGRIDDBAPI}/$1/game/${SteamGridDBId}?limit=1" - [[ -n "$3" ]] && SGDBIMGAPI+="&$3" - [[ -n "$4" ]] && SGDBIMGAPI+="&$4" - SGDBIMGRES=$(curl -Ls -H "Authorization: Bearer ${SGDBAPIKEY}" "${SGDBIMGAPI}") - if jq -e ".success == true and (.data | length > 0)" <<< "${SGDBIMGRES}" > /dev/null 2>&1; then - SGDBIMGURL=$(jq -r '.data[0].url' <<< "${SGDBIMGRES}") - downloadImage "${SGDBIMGURL}" "$2" - elif [[ -n "$3" ]]; then - downloadImageSteamGridDB "$1" "$2" "" "$4" + if [[ -n "${SteamGridDBId}" ]]; then + SGDBIMGAPI="${BASESTEAMGRIDDBAPI}/$1/game/${SteamGridDBId}?limit=1" + [[ -n "$3" ]] && SGDBIMGAPI+="&$3" + [[ -n "$4" ]] && SGDBIMGAPI+="&$4" + SGDBIMGRES=$(curl -Ls --connect-timeout 5 -m 10 -H "Authorization: Bearer ${SGDBAPIKEY}" "${SGDBIMGAPI}") + if jq -e ".success == true and (.data | length > 0)" <<< "${SGDBIMGRES}" > /dev/null 2>&1; then + SGDBIMGURL=$(jq -r '.data[0].url' <<< "${SGDBIMGRES}") + downloadImage "${SGDBIMGURL}" "$2" + elif [[ -n "$3" ]]; then + downloadImageSteamGridDB "$1" "$2" "" "$4" + else + return 1 + fi else return 1 fi } addGrids() { - if [[ -n "${SGDBAPIKEY}" ]]; then - getSteamGridDBId "${name_desktop}" > /dev/null + getSteamGridDBId "${name_desktop}" > /dev/null + if [[ "${USE_STEABGRIDDB:-1}" == "0" ]]; then + getSteamId > /dev/null fi - if [[ -n "${SteamGridDBId}" ]]; then + if [[ -n "${SteamGridDBId}" ]] || [[ -n "${SteamAppId}" ]]; then create_new_dir "${STCFGPATH}/grid" - downloadImageSteamGridDB "grids" "${NOSTAIDGRID}.jpg" "mimes=image/jpeg" "dimensions=460x215,920x430" || downloadImageSteam "header.jpg" "${NOSTAIDGRID}.jpg" || echo "Failed to load header.jpg" - downloadImageSteamGridDB "grids" "${NOSTAIDGRID}p.jpg" "mimes=image/jpeg" "dimensions=600x900,660x930" || downloadImageSteam "library_600x900_2x.jpg" "${NOSTAIDGRID}p.jpg" || echo "Failed to load library_600x900_2x.jpg" - downloadImageSteamGridDB "heroes" "${NOSTAIDGRID}_hero.jpg" "mimes=image/jpeg" || downloadImageSteam "library_hero.jpg" "${NOSTAIDGRID}_hero.jpg" || echo "Failed to load library_hero.jpg" - downloadImageSteamGridDB "logos" "${NOSTAIDGRID}_logo.png" "mimes=image/png" || downloadImageSteam "logo.png" "${NOSTAIDGRID}_logo.png" || echo "Failed to load logo.png" + downloadImageSteamGridDB "grids" "${NOSTAPPID:-0}.jpg" "mimes=image/jpeg" "dimensions=460x215,920x430" || downloadImageSteam "header.jpg" "${NOSTAPPID:-0}.jpg" || echo "Failed to load header.jpg" + downloadImageSteamGridDB "grids" "${NOSTAPPID:-0}p.jpg" "mimes=image/jpeg" "dimensions=600x900,660x930" || downloadImageSteam "library_600x900_2x.jpg" "${NOSTAPPID:-0}p.jpg" || echo "Failed to load library_600x900_2x.jpg" + downloadImageSteamGridDB "heroes" "${NOSTAPPID:-0}_hero.jpg" "mimes=image/jpeg" || downloadImageSteam "library_hero.jpg" "${NOSTAPPID:-0}_hero.jpg" || echo "Failed to load library_hero.jpg" + downloadImageSteamGridDB "logos" "${NOSTAPPID:-0}_logo.png" "mimes=image/png" || downloadImageSteam "logo.png" "${NOSTAPPID:-0}_logo.png" || echo "Failed to load logo.png" else echo "Game is not found" fi } -addNonSteamGame() { - NOSTAPPNAME="${name_desktop}" - NOSTSHPATH="${STEAM_SCRIPTS}/${name_desktop}.sh" - NOSTEXEPATH="\"${NOSTSHPATH}\"" - NOSTICONPATH="${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" - if [[ -z "${NOSTSTDIR}" ]]; then - NOSTSTDIR="\"${STEAM_SCRIPTS}\"" +addEntry() { + if [[ -n "${SCPATH}" ]]; then + if [[ -f "${SCPATH}" ]] ; then + truncate -s-2 "${SCPATH}" + OLDSET="$(grep -aPo '\x00[0-9]\x00\x02appid' "${SCPATH}" | tail -n1 | tr -dc '0-9')" + NEWSET=$((OLDSET + 1)) + else + printf '\x00%s\x00' "shortcuts" > "${SCPATH}" + NEWSET=0 + fi + NOSTAIDVDFHEXFMT="\x$(awk '{$1=$1}1' FPAT='.{2}' OFS="\\\x" <<< "$NOSTAIDVDFHEX")" # binary-formatted string hex of the above which we actually write out - ex: \xc1\xc2\x5a\xdc + + { + printf '\x00%s\x00' "${NEWSET}" + printf '\x02%s\x00%b' "appid" "${NOSTAIDVDFHEXFMT}" + printf '\x01%s\x00%s\x00' "AppName" "${NOSTAPPNAME}" + printf '\x01%s\x00%s\x00' "Exe" "\"${NOSTEXEPATH}\"" + printf '\x01%s\x00%s\x00' "StartDir" "\"${NOSTSTDIR}\"" + printf '\x01%s\x00%s\x00' "icon" "${NOSTICONPATH}" + printf '\x01%s\x00%s\x00' "ShortcutPath" "" + printf '\x01%s\x00%s\x00' "LaunchOptions" "${NOSTARGS:-}" + + printf '\x02%s\x00%b\x00\x00\x00' "IsHidden" "\x00" + printf '\x02%s\x00%b\x00\x00\x00' "AllowDesktopConfig" "\x00" + + # These values are now stored in localconfig.vdf under the "Apps" section, + # under a block using the Non-Steam Game Signed 32bit AppID. (i.e., -223056321) + # This is handled by `updateLocalConfigAppsValue` below + # + # Unsure if required, but still write these to the shortcuts.vdf file for consistency + printf '\x02%s\x00%b\x00\x00\x00' "AllowOverlay" "\x00" + printf '\x02%s\x00%b\x00\x00\x00' "OpenVR" "\x00" + + printf '\x02%s\x00\x00\x00\x00\x00' "Devkit" + printf '\x01%s\x00\x00' "DevkitGameID" + printf '\x02%s\x00\x00\x00\x00\x00' "DevkitOverrideAppID" + printf '\x02%s\x00\x00\x00\x00\x00' "LastPlayTime" + printf '\x01%s\x00\x00' "FlatpakAppID" + printf '\x00%s\x00' "tags" + printf '\x08\x08\x08\x08' + } >> "${SCPATH}" fi - STCFGPATH="$(getUserPath)" - if [[ -n "${STCFGPATH}" ]]; then +} + +removeNonSteamGame() { + [[ -n "$1" ]] && appid="$1" + [[ -n "$2" ]] && NOSTSHPATH="$2" + [[ -z "${STUID}" ]] && STUID=$(getUserId) + [[ -z "${STCFGPATH}" ]] && STCFGPATH="$(getUserPath ${STUID})" + if [[ -n "${STCFGPATH}" ]] && [[ -z "${SCPATH}" ]]; then + SCPATH="${STCFGPATH}/shortcuts.vdf" + fi + if [[ -n "${appid}" ]]; then + games=$(listNonSteamGames) + [[ -z "${NOSTSHPATH}" ]] && NOSTSHPATH=$(jq -r --arg id "${appid}" 'map(select(.id == $id)) | first(.[].exe)' <<< "${games}") + if [[ -n "${NOSTSHPATH}" ]]; then + mv "${SCPATH}" "${SCPATH//.vdf}_${PROGNAME}_backup.vdf" 2>/dev/null + jq --arg id "${appid}" 'map(select(.id != $id))' <<< "${games}" | jq -c '.[]' | while read -r game; do + NOSTAPPID=$(jq -r '.id' <<< "${game}") + NOSTAPPNAME=$(jq -r '.name' <<< "${game}") + NOSTEXEPATH=$(jq -r '.exe' <<< "${game}") + NOSTSTDIR=$(jq -r '.dir' <<< "${game}") + NOSTICONPATH=$(jq -r '.icon' <<< "${game}") + NOSTARGS=$(jq -r '.args' <<< "${game}") + NOSTAIDVDFHEX=$(bigToLittleEndian $(printf '%08x' "${NOSTAPPID}")) + addEntry + done + rm -f "${STCFGPATH}/grid/${appid}.jpg" "${STCFGPATH}/grid/${appid}p.jpg" "${STCFGPATH}/grid/${appid}_hero.jpg" "${STCFGPATH}/grid/${appid}_logo.png" + rm -rf "${HOME}/.local/share/Steam/steamapps/compatdata/${appid}" + rm -rf "${HOME}/.local/share/Steam/steamapps/shadercache/${appid}" + if [[ -f "${NOSTSHPATH}" ]]; then + isInstallGame=false + for STUIDCUR in $(getUserIds); do + [[ "${STUIDCUR}" == "${STUID}" ]] && continue + STCFGPATH="$(getUserPath ${STUIDCUR})" + SCPATH="${STCFGPATH}/shortcuts.vdf" + if [[ -n "$(getAppId "${NOSTSHPATH}")" ]]; then + isInstallGame=true + break + fi + done + unset STCFGPATH SCPATH + if [[ ${isInstallGame} == false ]]; then + rm "${NOSTSHPATH}" + fi + fi + restartSteam + fi + fi +} + +addNonSteamGame() { + if [[ -z "${STCFGPATH}" ]]; then + STCFGPATH="$(getUserPath)" + fi + if [[ -n "${STCFGPATH}" ]] && [[ -z "${SCPATH}" ]]; then SCPATH="${STCFGPATH}/shortcuts.vdf" fi if [[ -n "${SCPATH}" ]]; then - NOSTAIDGRID=$(getAppId "${NOSTSHPATH}") - if [[ -z "${NOSTAIDGRID}" ]]; then + [[ -z "${NOSTSHPATH}" ]] && NOSTSHPATH="${STEAM_SCRIPTS}/${name_desktop}.sh" + NOSTAPPNAME="${name_desktop}" + NOSTAPPID=$(getAppId "${NOSTSHPATH}") + if [[ -z "${NOSTAPPID}" ]]; then + NOSTEXEPATH="${NOSTSHPATH}" + if [[ -z "${NOSTSTDIR}" ]]; then + NOSTSTDIR="${STEAM_SCRIPTS}" + fi + NOSTICONPATH="${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" NOSTAIDVDF="$(generateShortcutVDFAppId "${NOSTAPPNAME}${NOSTEXEPATH}")" # signed integer AppID, stored in the VDF as hexidecimal - ex: -598031679 NOSTAIDVDFHEX="$(generateShortcutVDFHexAppId "$NOSTAIDVDF")" # 4byte little-endian hexidecimal of above 32bit signed integer, which we write out to the binary VDF - ex: c1c25adc - NOSTAIDVDFHEXFMT="\x$(awk '{$1=$1}1' FPAT='.{2}' OFS="\\\x" <<< "$NOSTAIDVDFHEX")" # binary-formatted string hex of the above which we actually write out - ex: \xc1\xc2\x5a\xdc - NOSTAIDGRID="$(generateShortcutGridAppId "$NOSTAIDVDF")" # unsigned 32bit ingeger version of "$NOSTAIDVDF", which is used as the AppID for Steam artwork ("grids"), as well as for our shortcuts + NOSTAPPID="$(extractSteamId32 "$NOSTAIDVDF")" # unsigned 32bit ingeger version of "$NOSTAIDVDF", which is used as the AppID for Steam artwork ("grids"), as well as for our shortcuts create_new_dir "${STEAM_SCRIPTS}" - echo "#!/usr/bin/env bash" > "${NOSTSHPATH}" - echo "export START_FROM_STEAM=1" >> "${NOSTSHPATH}" - echo "export LD_PRELOAD=" >> "${NOSTSHPATH}" - if check_flatpak; then - echo "flatpak run ru.linux_gaming.PortProton \"${portwine_exe}\" " >> "${NOSTSHPATH}" - else - echo "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" " >> "${NOSTSHPATH}" - fi + cat <<-EOF > "${NOSTSHPATH}" + #!/usr/bin/env bash + export LD_PRELOAD= + export START_FROM_STEAM=1 + export START_FROM_FLATPAK=$(check_flatpak && echo 1 || echo 0) + "${PORT_SCRIPTS_PATH}/start.sh" "${portwine_exe}" "\$@" + EOF chmod u+x "${NOSTSHPATH}" if [[ -f "${SCPATH}" ]] ; then cp "${SCPATH}" "${SCPATH//.vdf}_${PROGNAME}_backup.vdf" 2>/dev/null - truncate -s-2 "${SCPATH}" - OLDSET="$(grep -aPo '\x00[0-9]\x00\x02appid' "${SCPATH}" | tail -n1 | tr -dc '0-9')" - NEWSET=$((OLDSET + 1)) - else - printf '\x00%s\x00' "shortcuts" > "${SCPATH}" - NEWSET=0 fi - { - printf '\x00%s\x00' "${NEWSET}" - printf '\x02%s\x00%b' "appid" "${NOSTAIDVDFHEXFMT}" - printf '\x01%s\x00%s\x00' "AppName" "${NOSTAPPNAME}" - printf '\x01%s\x00%s\x00' "Exe" "${NOSTEXEPATH}" - printf '\x01%s\x00%s\x00' "StartDir" "${NOSTSTDIR}" - printf '\x01%s\x00%s\x00' "icon" "${NOSTICONPATH}" - printf '\x01%s\x00%s\x00' "ShortcutPath" "" - printf '\x01%s\x00%s\x00' "LaunchOptions" "" - - printf '\x02%s\x00%b\x00\x00\x00' "IsHidden" "\x00" - printf '\x02%s\x00%b\x00\x00\x00' "AllowDesktopConfig" "\x00" - - # These values are now stored in localconfig.vdf under the "Apps" section, - # under a block using the Non-Steam Game Signed 32bit AppID. (i.e., -223056321) - # This is handled by `updateLocalConfigAppsValue` below - # - # Unsure if required, but still write these to the shortcuts.vdf file for consistency - printf '\x02%s\x00%b\x00\x00\x00' "AllowOverlay" "\x00" - printf '\x02%s\x00%b\x00\x00\x00' "OpenVR" "\x00" - - printf '\x02%s\x00\x00\x00\x00\x00' "Devkit" - printf '\x01%s\x00\x00' "DevkitGameID" - printf '\x02%s\x00\x00\x00\x00\x00' "DevkitOverrideAppID" - printf '\x02%s\x00\x00\x00\x00\x00' "LastPlayTime" - printf '\x01%s\x00\x00' "FlatpakAppID" - printf '\x00%s\x00' "tags" - printf '\x08\x08\x08\x08' - } >> "${SCPATH}" - - # TODO: замень использование steamgriddb на steam так как сайт steamgriddb у многих без VPN не работает - # а пока просто блочим использование - export DOWNLOAD_STEAM_GRID="0" + addEntry if [[ "${DOWNLOAD_STEAM_GRID}" == "1" ]] ; then pw_start_progress_bar_block "${translations[Please wait. downloading covers for]} ${NOSTAPPNAME}" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index f7d31fcd..9bc690a9 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -410,6 +410,7 @@ lsbash () { else directory=$PWD fi + grep_find_file1 () { find_file_old=$find_file if [[ $grep_with_i == true ]] ; then @@ -975,10 +976,25 @@ debug_timer () { fi } +fix_icon_name_png () { + if [[ $1 =~ [\!\%\$\&\<] ]] ; then + local ICON_NAME_OLD=$1 + local ICON_NAME_NEW=$ICON_NAME_OLD + local ICON_NAME_REGEX=(\! % \$ \& \<) + for i in "${ICON_NAME_REGEX[@]}" ; do + ICON_NAME_NEW="${ICON_NAME_NEW//$i/}" + done + sed -i "s|Icon=$ICON_NAME_OLD|Icon=$ICON_NAME_NEW|" "$2" + return 0 + else + return 1 + fi +} + # Поиск нужного .desktop файла по $portwine_exe (для показа в комментариях нужного времени) # Параллельное создание базы по времени после завершения приложения search_desktop_file () { - local desktop_file desktop_file_new line1 line2 FILE_SHA256SUM_ARRAY EXEC_DESKTOP BROKEN_LINE FILE_SHA256SUM_FOUND FILE_SHA256SUM_NOT_FOUND + local desktop_file desktop_file_new line1 line2 FILE_SHA256SUM_ARRAY EXEC_DESKTOP ICON_NAME BROKEN_LINE FILE_SHA256SUM_FOUND FILE_SHA256SUM_NOT_FOUND if [[ -z $FILE_SHA256SUM ]] ; then read -r -a FILE_SHA256SUM_ARRAY < <(sha256sum "$portwine_exe") FILE_SHA256SUM=${FILE_SHA256SUM_ARRAY[0]} @@ -996,7 +1012,9 @@ search_desktop_file () { EXEC_DESKTOP=${line1//Exec=env \"$PORT_SCRIPTS_PATH\/start.sh\" /} fi fi + [[ $line1 =~ ^Icon= ]] && ICON_NAME=${line1//Icon=/} done < "$desktop_file" + fix_icon_name_png "$ICON_NAME" "$desktop_file" if [[ $portwine_exe == "${EXEC_DESKTOP//\"/}" ]] ; then DESKTOP_CORRECT_FILE="$desktop_file" break @@ -1607,7 +1625,7 @@ init_wine_ver () { else if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then IFS=$'\n' - for dist_dir in $(lsbash "${PORT_WINE_PATH}/data/dist/") ; do + for dist_dir in $(ls -1 "${PORT_WINE_PATH}/data/dist") ; do dist_dir_new=$(echo "${dist_dir}" | awk '$1=$1' | sed -e s/[[:blank:]]/_/g) if [[ ! -d "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" ]] ; then mv -- "${PORT_WINE_PATH}/data/dist/$dist_dir" "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" @@ -1615,7 +1633,7 @@ init_wine_ver () { done IFS="$orig_IFS" fi - if [[ -z $(lsbash "${PORT_WINE_PATH}/data/dist/" --grep "${PW_WINE_USE}") ]] ; then + if [[ -z $(ls "${PORT_WINE_PATH}/data/dist/" | grep "${PW_WINE_USE}") ]] ; then if [[ "$PW_WINE_USE" =~ PROTON_LG* ]] then export PW_WINE_USE=PROTON_LG else export PW_WINE_USE=WINE_LG @@ -1632,20 +1650,20 @@ init_wine_ver () { export WINELOADER="${WINEDIR}/bin/wine" export WINESERVER="${WINEDIR}/bin/wineserver" if [[ -d "${WINEDIR}/files" && ! -d "${WINEDIR}/dist" ]] ; then - for clear_dist_files in $(lsbash "$WINEDIR" | sed -r "s/^(files|version)$//g") ; do + for clear_dist_files in $(ls "${WINEDIR}" | sed -r "s/^(files|version)$//g") ; do rm -fr "${WINEDIR}/$clear_dist_files" done mv -f "${WINEDIR}/files"/* "${WINEDIR}/" rm -fr "${WINEDIR}/files" elif [[ ! -d "${WINEDIR}/files" && -d "${WINEDIR}/dist" ]] ; then - for clear_dist_files in $(lsbash "$WINEDIR" | sed -r "s/^(dist|version)$//g") ; do + for clear_dist_files in $(ls "${WINEDIR}" | sed -r "s/^(dist|version)$//g") ; do rm -fr "${WINEDIR}/$clear_dist_files" done mv -f "${WINEDIR}/dist"/* "${WINEDIR}/" rm -fr "${WINEDIR}/dist" elif [[ -f "${WINEDIR}/proton_dist.tar" ]] ; then unpack "${WINEDIR}/proton_dist.tar" "${WINEDIR}/" - for clear_dist_files in $(lsbash "$WINEDIR" | sed -r "s/^(bin|lib|lib64|share|version)$//g") ; do + for clear_dist_files in $(ls "${WINEDIR}" | sed -r "s/^(bin|lib|lib64|share|version)$//g") ; do rm -fr "${WINEDIR}/$clear_dist_files" done fi @@ -1934,7 +1952,7 @@ pw_kill_autostart () { fi done - if [[ -n "$(lsbash "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/ | grep -m 1 ".tmp")" ]] ; then + if [[ -n "$(ls "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/ | grep -m 1 ".tmp")" ]] ; then rm -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/*.tmp fi @@ -2025,8 +2043,8 @@ pw_download_libs () { "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ; then if unpack "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/" ; then try_remove_file "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" - if lsbash "${PORT_WINE_TMP_PATH}" --grep libs_v --grep -v libs"${PW_LIBS_VER}" ; then - for RM_LIBS in $(lsbash "${PORT_WINE_TMP_PATH}" --grep libs_v --grep -v libs"${PW_LIBS_VER}") + if ls "${PORT_WINE_TMP_PATH}" | grep libs_v | grep -v libs"${PW_LIBS_VER}" ; then + for RM_LIBS in $(ls "${PORT_WINE_TMP_PATH}" | grep libs_v | grep -v libs"${PW_LIBS_VER}") do try_remove_dir "${PORT_WINE_TMP_PATH}/${RM_LIBS}" done fi @@ -2176,9 +2194,9 @@ pw_check_and_download_plugins () { try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" # TODO: drop clear prefix, and add update prefix from new plugins pw_clear_pfx - if lsbash "${PORT_WINE_TMP_PATH}" --grep plugins_v --grep -v "plugins${PW_PLUGINS_VER}" + if ls "${PORT_WINE_TMP_PATH}" | grep plugins_v | grep -v "plugins${PW_PLUGINS_VER}" then - for RM_PLUGINS in $(lsbash "${PORT_WINE_TMP_PATH}" --grep plugins_v --grep -v "plugins${PW_PLUGINS_VER}") + for RM_PLUGINS in $(ls "${PORT_WINE_TMP_PATH}" | grep plugins_v | grep -v "plugins${PW_PLUGINS_VER}") do try_remove_dir "${PORT_WINE_TMP_PATH}/${RM_PLUGINS}" done fi @@ -2209,9 +2227,9 @@ pw_check_and_download_plugins () { try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" # TODO: drop clear prefix, and add update prefix from new plugins pw_clear_pfx - if lsbash "${PORT_WINE_TMP_PATH}" --grep plugins_v --grep -v "plugins${PW_PLUGINS_VER}" + if ls "${PORT_WINE_TMP_PATH}" | grep plugins_v | grep -v "plugins${PW_PLUGINS_VER}" then - for RM_PLUGINS in $(lsbash "${PORT_WINE_TMP_PATH}" --grep plugins_v --grep -v "plugins${PW_PLUGINS_VER}") + for RM_PLUGINS in $(ls "${PORT_WINE_TMP_PATH}" | grep plugins_v | grep -v "plugins${PW_PLUGINS_VER}") do try_remove_dir "${PORT_WINE_TMP_PATH}/${RM_PLUGINS}" done fi @@ -2338,7 +2356,7 @@ pw_init_db () { # shellcheck source=/dev/null source "${PORTWINE_DB_FILE}" if echo "${portwine_exe}" | grep "/prefixes/" &>/dev/null ; then - if [[ -z $(lsbash "${PORT_WINE_PATH}/prefixes/" --grep ^"${PW_PREFIX_NAME}"$) ]] \ + if [[ -z $(ls "${PORT_WINE_PATH}/prefixes/" | grep -e ^"${PW_PREFIX_NAME}"$) ]] \ || [[ -z $(grep -e ^"export PW_PREFIX_NAME=" "${PORTWINE_DB_FILE}" 2>/dev/null) ]] then PW_PREFIX_NAME=$(echo "${portwine_exe}" | awk -F"/prefixes/" '{print $2}' | awk -F"/" '{print $1}') @@ -2378,7 +2396,7 @@ pw_init_db () { try_copy_file "${PW_FIND_DB_FILE}" "${portwine_exe}".ppdb PORTWINE_DB_FILE="${portwine_exe}".ppdb if echo "${portwine_exe}" | grep "/prefixes/" &>/dev/null ; then - if [[ -z $(lsbash "${PORT_WINE_PATH}/prefixes/" --grep ^"${PW_PREFIX_NAME}"$) ]] \ + if [[ -z $(ls "${PORT_WINE_PATH}/prefixes/" | grep -e ^"${PW_PREFIX_NAME}"$) ]] \ || [[ -z $(grep -e ^"export PW_PREFIX_NAME=" "${PORTWINE_DB_FILE}" 2>/dev/null) ]] then PW_PREFIX_NAME=$(echo "${portwine_exe}" | awk -F"/prefixes/" '{print $2}' | awk -F"/" '{print $1}') @@ -2427,7 +2445,7 @@ pw_init_db () { if [[ "${PW_WINE_CPU_TOPOLOGY}" == "disabled" ]] && [[ -n "${WINE_CPU_TOPOLOGY}" ]] ; then export PW_WINE_CPU_TOPOLOGY="${WINE_CPU_TOPOLOGY}" fi - if lsbash "${PATH_TO_GAME}"/*_Data/Resources/ --grep "unity" &>/dev/null \ + if ls "${PATH_TO_GAME}"/*_Data/Resources/ 2>/dev/null | grep "unity" &>/dev/null \ && [[ "${PW_WINE_CPU_TOPOLOGY}" == "disabled" ]] \ && [[ $(grep -c ^"processor" /proc/cpuinfo) -gt "8" ]] then @@ -2886,11 +2904,17 @@ edit_db_from_gui () { then for mod_db in "$@" ; do proxy_mod_db="${!mod_db}" - if [[ $proxy_mod_db =~ (${translations[Disabled]}|${translations[Disable]}) ]] ; then - proxy_mod_db=disabled - elif [[ $proxy_mod_db =~ (${translations[Enabled]}|${translations[Enable]}) ]] ; then - proxy_mod_db=enabled + if (( ${#translations[@]} > 0 )); then + if [[ $proxy_mod_db =~ (${translations[Disabled]}|${translations[Disable]}) ]] ; then + proxy_mod_db=disabled + elif [[ $proxy_mod_db =~ (${translations[Enabled]}|${translations[Enable]}) ]] ; then + proxy_mod_db=enabled + fi fi + + # Escaping backslashes and quotes for Windows paths + proxy_mod_db=$(echo "$proxy_mod_db" | sed 's/\\/\\\\\\\\/g; s/"/\\"/g') + if [[ $(<"${PORTWINE_DB_FILE}") =~ export\ ${mod_db}= ]] then sed -i "s|export ${mod_db}=.*|export ${mod_db}=\"$proxy_mod_db\"|g" "${PORTWINE_DB_FILE}" else echo "export ${mod_db}=\"$proxy_mod_db\"" >> "${PORTWINE_DB_FILE}" @@ -2982,9 +3006,15 @@ pw_create_gui_png () { edit_db_from_gui PORTPROTON_NAME FILE_DESCRIPTION fi - resize_png "$portwine_exe" "${PORTPROTON_NAME}" "128" + resize_png "$portwine_exe" "${PORTPROTON_NAME}" "48" "128" PORTPROTON_NAME_PNG="${PORTPROTON_NAME// /_}" + if [[ $PORTPROTON_NAME_PNG =~ [\!\%\$\&\<] ]] ; then + local ICON_NAME_REGEX=(\! % \$ \& \<) + for i in "${ICON_NAME_REGEX[@]}" ; do + PORTPROTON_NAME_PNG="${PORTPROTON_NAME_PNG//$i/}" + done + fi if [[ -z "${PW_ICON_FOR_YAD}" ]] ; then if [[ -n "$(file "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME_PNG}.png" | grep "${PW_RESIZE_TO} x ${PW_RESIZE_TO}")" ]] ; then export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME_PNG}.png" @@ -3140,18 +3170,18 @@ start_portwine () { var_winedlloverride_update "winegstreamer=" fi - check_variables VKD3D_DEBUG none - check_variables VKD3D_SHADER_DEBUG none - check_variables DXVK_LOG_LEVEL none - check_variables DXVK_NVAPI_LOG_LEVEL none - check_variables VK_LOADER_DEBUG none - check_variables VKBASALT_LOG_LEVEL none + check_variables VKD3D_DEBUG "none" + check_variables VKD3D_SHADER_DEBUG "none" + check_variables DXVK_LOG_LEVEL "none" + check_variables DXVK_NVAPI_LOG_LEVEL "none" + check_variables VK_LOADER_DEBUG "none" + check_variables VKBASALT_LOG_LEVEL "none" if [[ "${PW_LOG}" == 1 ]] \ || [[ -n "$PW_DEBUG" ]] then - export WINEDEBUG="+loaddll,+gstreamer" - export WINE_MONO_TRACE="E:System.NotImplementedException" - export VKBASALT_LOG_LEVEL="error" + check_variables WINEDEBUG "+loaddll" + check_variables WINE_MONO_TRACE "E:System.NotImplementedException" + check_variables VKBASALT_LOG_LEVEL "error" else export WINEDEBUG="-all" unset WINE_MONO_TRACE @@ -4368,6 +4398,35 @@ pw_yad_form_vulkan () { fi } +steamplay_launch () { + if [[ -n "${portwine_exe:-}" ]]; then + cd "$(dirname "${portwine_exe}")" + export PORTWINE_DB_FILE="${portwine_exe}.ppdb" + [[ -f "${PORTWINE_DB_FILE}" ]] && source "${PORTWINE_DB_FILE}" + PORT_WINE_PREFIX="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME:-DEFAULT}" + for path in "ProgramData" "users/Public" "users/steamuser"; do + mkdir -p "${PORT_WINE_PREFIX}/drive_c/${path}" + if [[ ! -L "${WINEPREFIX}/drive_c/${path}" ]]; then + mkdir -p "${WINEPREFIX}/drive_c/users/" + rm -rf "${WINEPREFIX}/drive_c/${path}" + ln -sr "${PORT_WINE_PREFIX}/drive_c/${path}" "${WINEPREFIX}/drive_c/${path}" + fi + done + if [[ -n "${PW_DLL_INSTALL:-}" ]] ; then + update_winetricks + PATH="${PATH}:${PW_PLUGINS_PATH}/portable/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32" \ + "${PORT_WINE_TMP_PATH}/winetricks" -q ${PW_DLL_INSTALL} + fi + [[ $PW_LOG != 1 ]] && debug_timer --start -s "PW_TIME_IN_GAME" + "${STEAM_COMPAT_TOOL_PATHS%%:*}/proton" "run" "${portwine_exe}" "$@" + if [[ $PW_LOG != 1 ]] && [[ -n $START_PW_TIME_IN_GAME ]] ; then + debug_timer --end -s "PW_TIME_IN_GAME" + PW_TIME_IN_GAME=$(( PW_TIME_IN_GAME / 1000 )) + search_desktop_file + fi + fi +} + portwine_launch () { start_portwine unset PW_VD_TMP @@ -6074,35 +6133,49 @@ resize_png () { print_error "no argument specified for resize_png" return 1 else - local RESIZE_FILE="$1" - local RESIZE_NAME_PNG="${2// /_}" - local RESIZE_TO="$3" + local RESIZE_FILE RESIZE_NAME_PNG resize_to resize_to_helper + RESIZE_FILE="$1" + RESIZE_NAME_PNG="${2// /_}" fi - if [[ -f "${PORT_WINE_PATH}/data/img/${RESIZE_NAME_PNG}.png" ]] \ - || [[ ! -f "${RESIZE_FILE}" ]] \ - || [[ ! ${RESIZE_FILE,,} =~ .exe$ ]] - then - return 0 - fi - try_remove_file "${PORT_WINE_PATH}/data/img/launcher.png" - try_remove_file "${PORT_WINE_PATH}/data/img/Launcher.png" - - if check_flatpak ; then - if ! timeout 3 \ - exe-thumbnailer --force-resize -s "$RESIZE_TO" "$(readlink -f "${RESIZE_FILE}")" "${PORT_WINE_PATH}/data/img/${RESIZE_NAME_PNG}.png" \ - && [[ "$ALPINE_FP" != "1" ]] - then - print_error "exe-thumbnailer - broken!" + for resize_to in "${@:3}" ; do + if [[ $resize_to == 128 ]] + then resize_to_helper="" + else resize_to_helper="_$resize_to" fi - else - print_warning "use portable exe-thumbnailer" - env PYTHONPATH="${PW_PLUGINS_PATH}/portable/lib/python3.9/site-packages/" \ - LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64" \ - "${PW_WINELIB}/runtime/files/bin/python3.9" \ - "${PW_PLUGINS_PATH}/portable/bin/exe-thumbnailer" --force-resize -s "$RESIZE_TO" "$(readlink -f "${RESIZE_FILE}")" "${PORT_WINE_PATH}/data/img/${RESIZE_NAME_PNG}.png" - fi - return 0 + + if [[ $RESIZE_NAME_PNG =~ [\!\%\$\&\<] ]] ; then + local ICON_NAME_REGEX=(\! % \$ \& \<) + for i in "${ICON_NAME_REGEX[@]}" ; do + RESIZE_NAME_PNG="${RESIZE_NAME_PNG//$i/}" + done + fi + + if [[ -f "${PORT_WINE_PATH}/data/img/${RESIZE_NAME_PNG}${resize_to_helper}.png" ]] \ + || [[ ! -f "${RESIZE_FILE}" ]] \ + || [[ ! ${RESIZE_FILE,,} =~ .exe$ ]] + then + return 0 + fi + + try_remove_file "${PORT_WINE_PATH}/data/img/launcher.png" + try_remove_file "${PORT_WINE_PATH}/data/img/Launcher.png" + + if check_flatpak ; then + if ! timeout 3 \ + exe-thumbnailer --force-resize -s "$resize_to" "$(readlink -f "${RESIZE_FILE}")" "${PORT_WINE_PATH}/data/img/${RESIZE_NAME_PNG}${resize_to_helper}.png" \ + && [[ "$ALPINE_FP" != "1" ]] + then + print_error "exe-thumbnailer - broken!" + fi + else + print_warning "use portable exe-thumbnailer" + env PYTHONPATH="${PW_PLUGINS_PATH}/portable/lib/python3.9/site-packages/" \ + LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64" \ + "${PW_WINELIB}/runtime/files/bin/python3.9" \ + "${PW_PLUGINS_PATH}/portable/bin/exe-thumbnailer" --force-resize -s "$resize_to" "$(readlink -f "${RESIZE_FILE}")" "${PORT_WINE_PATH}/data/img/${RESIZE_NAME_PNG}${resize_to_helper}.png" + fi + done } # GUI CREATE SHORTCUT @@ -6122,6 +6195,12 @@ portwine_create_shortcut () { export name_desktop="$PW_NAME_DESKTOP_PROXY" [[ -z "${name_desktop_png}" ]] && name_desktop_png="${PORTPROTON_NAME// /_}" + if [[ $name_desktop_png =~ [\!\%\$\&\<] ]] ; then + local ICON_NAME_REGEX=(\! % \$ \& \<) + for i in "${ICON_NAME_REGEX[@]}" ; do + name_desktop_png="${name_desktop_png//$i/}" + done + fi OUTPUT=$("${pw_yad}" --title="${translations[Choices]}" --form \ --gui-type="settings-shortcut" \ @@ -6168,7 +6247,7 @@ portwine_output_yad_shortcut () { echo "Path=${PORT_SCRIPTS_PATH}/" echo "Icon=${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" } >> "${PORT_WINE_PATH}/${name_desktop}.desktop" - chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop" + chmod +x "${PORT_WINE_PATH}/${name_desktop}.desktop" if [[ "${PW_SHORTCUT_MENU}" == "TRUE" ]] ; then try_remove_file "${HOME}/.local/share/applications/${name_desktop}.desktop" @@ -6287,7 +6366,7 @@ pw_auto_create_shortcut () { print_info "Created link for: $link_name" PORTPROTON_NAME="$link_name" export portwine_exe="$exe_path" - resize_png "$portwine_exe" "${PORTPROTON_NAME}" "128" + resize_png "$portwine_exe" "${PORTPROTON_NAME}" "48" "128" export PW_NO_RESTART_PPDB=1 portwine_create_shortcut fi @@ -6308,7 +6387,18 @@ portwine_change_shortcut () { then PW_SHORTCUT_DESKTOP="TRUE" else PW_SHORTCUT_DESKTOP="FALSE" fi - PW_SHORTCUT_STEAM="FALSE" + if [[ -n $PW_DELETE_STEAM ]]; then + source "${PORT_SCRIPTS_PATH}/add_in_steam.sh" + NOSTSHPATH="${PW_DELETE_SHORTCUT_STEAM[0]//#@_@#/ }" + NOSTAIDGRID=$(getAppId "${NOSTSHPATH}") + if [[ -n "${NOSTSHPATH}" ]] && [[ -n "${NOSTAIDGRID}" ]]; then + PW_SHORTCUT_STEAM="TRUE" + else + PW_SHORTCUT_STEAM="FALSE" + fi + else + PW_SHORTCUT_STEAM="FALSE" + fi unset name_desktop create_name_desktop @@ -6316,6 +6406,12 @@ portwine_change_shortcut () { pw_create_gui_png [[ -z "${name_desktop_png}" ]] && name_desktop_png="${PORTPROTON_NAME// /_}" + if [[ $name_desktop_png =~ [\!\%\$\&\<] ]] ; then + local ICON_NAME_REGEX=(\! % \$ \& \<) + for i in "${ICON_NAME_REGEX[@]}" ; do + name_desktop_png="${name_desktop_png//$i/}" + done + fi OUTPUT=$("${pw_yad}" --title="${translations[Choices]}" --form \ --gui-type="settings-shortcut" \ @@ -6334,6 +6430,7 @@ portwine_change_shortcut () { PORTWINE_CHANGE_SHORTCUT=1 if [[ $PW_YAD_OUT == 1 ]] ; then [[ "$PW_GUI_START" == "NOTEBOOK" ]] && unset PW_YAD_FORM_TAB + PW_SHORTCUT_STEAM="FALSE" portwine_delete_shortcut restart_pp fi @@ -6341,24 +6438,29 @@ portwine_change_shortcut () { } portwine_search_shortcut () { - unset PW_DELETE_SHORTCUT_MENU PW_DELETE_SHORTCUT_DESKTOP - PW_DELETE_MENU="$(grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop 2>/dev/null)" - read -r -d '' -a PW_DELETE_SHORTCUT_MENU <<< "${PW_DELETE_SHORTCUT_MENU[*]} ${PW_DELETE_MENU// /#@_@#}" + unset PW_DELETE_SHORTCUT_MENU PW_DELETE_SHORTCUT_STEAM PW_DELETE_SHORTCUT_DESKTOP + if [[ -n "${portwine_exe}" ]]; then + PW_DELETE_MENU="$(grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop 2>/dev/null)" + read -r -d '' -a PW_DELETE_SHORTCUT_MENU <<< "${PW_DELETE_SHORTCUT_MENU[*]} ${PW_DELETE_MENU// /#@_@#}" - PW_DELETE_PP="$(grep -il "${portwine_exe}" "${PORT_WINE_PATH}"/*.desktop 2>/dev/null)" - read -r -d '' -a PW_DELETE_SHORTCUT_MENU <<< "${PW_DELETE_SHORTCUT_MENU[*]} ${PW_DELETE_PP// /#@_@#}" + PW_DELETE_PP="$(grep -il "${portwine_exe}" "${PORT_WINE_PATH}"/*.desktop 2>/dev/null)" + read -r -d '' -a PW_DELETE_SHORTCUT_MENU <<< "${PW_DELETE_SHORTCUT_MENU[*]} ${PW_DELETE_PP// /#@_@#}" - if [[ -d "${HOME}/Desktop" ]] ; then - PW_DELETE_DESKTOP="$(grep -il "${portwine_exe}" "${HOME}/Desktop"/*.desktop 2>/dev/null)" - read -r -d '' -a PW_DELETE_SHORTCUT_DESKTOP <<< "${PW_DELETE_SHORTCUT_DESKTOP[*]} ${PW_DELETE_DESKTOP// /#@_@#}" - fi - if [[ -d "${HOME}/Рабочий стол" ]] ; then - PW_DELETE_DESKTOP="$(grep -il "${portwine_exe}" "${HOME}/Рабочий стол"/*.desktop 2>/dev/null)" - read -r -d '' -a PW_DELETE_SHORTCUT_DESKTOP <<< "${PW_DELETE_SHORTCUT_DESKTOP[*]} ${PW_DELETE_DESKTOP// /#@_@#}" - fi - if [[ $(xdg-user-dir DESKTOP) ]] ; then - PW_DELETE_DESKTOP="$(grep -il "${portwine_exe}" "$(xdg-user-dir DESKTOP)"/*.desktop 2>/dev/null)" - read -r -d '' -a PW_DELETE_SHORTCUT_DESKTOP <<< "${PW_DELETE_SHORTCUT_DESKTOP[*]} ${PW_DELETE_DESKTOP// /#@_@#}" + PW_DELETE_STEAM="$(grep -il "${portwine_exe}" "${STEAM_SCRIPTS}"/*.sh 2>/dev/null)" + read -r -d '' -a PW_DELETE_SHORTCUT_STEAM <<< "${PW_DELETE_SHORTCUT_STEAM[*]} ${PW_DELETE_STEAM// /#@_@#}" + + if [[ -d "${HOME}/Desktop" ]] ; then + PW_DELETE_DESKTOP="$(grep -il "${portwine_exe}" "${HOME}/Desktop"/*.desktop 2>/dev/null)" + read -r -d '' -a PW_DELETE_SHORTCUT_DESKTOP <<< "${PW_DELETE_SHORTCUT_DESKTOP[*]} ${PW_DELETE_DESKTOP// /#@_@#}" + fi + if [[ -d "${HOME}/Рабочий стол" ]] ; then + PW_DELETE_DESKTOP="$(grep -il "${portwine_exe}" "${HOME}/Рабочий стол"/*.desktop 2>/dev/null)" + read -r -d '' -a PW_DELETE_SHORTCUT_DESKTOP <<< "${PW_DELETE_SHORTCUT_DESKTOP[*]} ${PW_DELETE_DESKTOP// /#@_@#}" + fi + if [[ $(xdg-user-dir DESKTOP) ]] ; then + PW_DELETE_DESKTOP="$(grep -il "${portwine_exe}" "$(xdg-user-dir DESKTOP)"/*.desktop 2>/dev/null)" + read -r -d '' -a PW_DELETE_SHORTCUT_DESKTOP <<< "${PW_DELETE_SHORTCUT_DESKTOP[*]} ${PW_DELETE_DESKTOP// /#@_@#}" + fi fi } @@ -6371,6 +6473,11 @@ portwine_delete_shortcut () { for delete_shortcut in "${PW_DELETE_SHORTCUT_MENU[@]}" "${PW_DELETE_SHORTCUT_DESKTOP[@]}" ; do rm -f "${delete_shortcut//#@_@#/ }" done + + if [[ "${PW_SHORTCUT_STEAM}" == "FALSE" ]] && [[ -n "${NOSTSHPATH}" ]] && [[ -n "${NOSTAIDGRID}" ]]; then + source "${PORT_SCRIPTS_PATH}/add_in_steam.sh" + removeNonSteamGame "${NOSTAIDGRID}" "${NOSTSHPATH}" + fi } portwine_missing_shortcut () { @@ -6965,7 +7072,7 @@ gui_edit_db_file () { } gui_open_scripts_from_backup () { - cd "${PORT_WINE_TMP_PATH}/scripts_backup/" || fatal + [[ -d "${PORT_WINE_TMP_PATH}/scripts_backup/" ]] && cd "${PORT_WINE_TMP_PATH}/scripts_backup/" || cd "$HOME" PW_SCRIPT_FROM_BACKUP=$("${pw_yad}" --file --width=650 --height=500 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "SCRIPTS FROM BACKUP" --file-filter="backup_scripts|scripts_v*.tar.gz" 2>/dev/null ) YAD_STATUS="$?" diff --git a/data_from_portwine/scripts/portwine_db/HogwartsLegacy.ppdb b/data_from_portwine/scripts/portwine_db/HogwartsLegacy.ppdb index f4bfbf98..babbe60b 100644 --- a/data_from_portwine/scripts/portwine_db/HogwartsLegacy.ppdb +++ b/data_from_portwine/scripts/portwine_db/HogwartsLegacy.ppdb @@ -3,16 +3,18 @@ #HogwartsLegacy.exe #Rating=1-5 #####################examples########################### -if [[ "$LANGUAGE" == "ru" ]] ; then - export PW_COMMENT_DB="Если у вас игра не запускается, то необходимо добавить +if [[ $(cat /proc/cpuinfo | grep umip) ]] ; then + if [[ "$LANGUAGE" == "ru" ]] ; then + export PW_COMMENT_DB="Если у вас игра не запускается, то необходимо добавить clearcpuid=514 в раздел GRUB_CMDLINE_LINUX_DEFAULT в файле /etc/default/grub. Для упрощения можно использовать утилиту Grub Customizer" -else - export PW_COMMENT_DB="If your game does not start, you need to add + else + export PW_COMMENT_DB="If your game does not start, you need to add clearcpuid=514 to the GRUB_CMDLINE_LINUX_DEFAULT section in the /etc/default/grub file. To simplify things, you can use Grub Customizer utility" + fi fi export PW_VULKAN_USE="2" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_FRACTURED_ONLINE b/data_from_portwine/scripts/pw_autoinstall/PW_FRACTURED_ONLINE new file mode 100755 index 00000000..ff243ff0 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_FRACTURED_ONLINE @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +# Author: chal55rus +# type: games +# name: Fractured Online (ENG) +# image: fracturedonline +# info_en: Fractured Online is the first open-world sandbox MMORPG mixing action combat with fully interactable environments, appealing equally to lovers of competitive and cooperative gameplay. Jump right into the fray from day one. Defeat your enemies through your own skill and cleverness, not equipment or level. Gather resources, craft, trade and venture into legendary travels as a solitary hero, or start a settlement with your guild and grow it into the next empire. +# info_ru: Fractured Online — это первая массовая многопользовательская ролевая онлайн-игра с открытым миром, сочетающая динамичные сражения с полностью интерактивным окружением. Она одинаково понравится любителям соревновательного и кооперативного игрового процесса. С самого первого дня погрузитесь в бой. Побеждайте врагов благодаря собственным навыкам и смекалке, а не снаряжению или уровню. Собирайте ресурсы, создавайте предметы, торгуйте и отправляйтесь в легендарные путешествия в одиночку или создайте поселение со своей гильдией и превратите его в следующую империю. +######################################################################## +export PW_PREFIX_NAME="FRACTURED_ONLINE" +export LAUNCH_PARAMETERS="/S" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/fractured-online-setup.exe" +export PORTWINE_CREATE_SHORTCUT_NAME="Fractured Online" + +start_portwine +if try_download "https://assets.fracturedmmo.com/clients/3f990010d1afb2cabadc44c6c849116c/fractured-online-setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror +then + pw_start_progress_bar_install_game "Fractured Online." + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe="$WINEPREFIX/drive_c/Program Files/Fractured Online/FracturedOnline.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + try_remove_file "${portwine_exe}.ppdb" + kill_portwine + pw_stop_progress_bar + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LAST_CHAOS b/data_from_portwine/scripts/pw_autoinstall/PW_LAST_CHAOS new file mode 100755 index 00000000..0c1b945e --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LAST_CHAOS @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# Author: chal55rus +# type: games +# name: Last Chaos +# image: lastchaos +# info_en: Last Chaos is a classic MMORPG with six classes, castle sieges, a Korean grind and kilometers of dungeons. The confrontation between Apollo and Eres is gaining momentum, so hurry up to take one of the sides. +# info_ru: Last Chaos – классическая MMORPG с шестью классами, осадами замков, корейским гриндом и километрами подземелий. Противостояние Апполона и Эреса набирает обороты, так что спешите принять одну из сторон. +######################################################################## +export PW_PREFIX_NAME="LAST_CHAOS" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Last Chaos.zip" +export PORTWINE_CREATE_SHORTCUT_NAME="Last Chaos" + +start_portwine +if try_download "https://last-chaos.ru/download/Last%20Chaos.zip" "${PW_AUTOINSTALL_EXE}" no_mirror +then + pw_start_progress_bar_install_game "Last Chaos." + "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"${WINEPREFIX}/drive_c/Program Files/" + portwine_exe="${WINEPREFIX}/drive_c/Program Files/Last Chaos/LC.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + try_remove_file "${portwine_exe}.ppdb" + kill_portwine + pw_stop_progress_bar + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 1d55a7bb..f2fa1a71 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -6,6 +6,11 @@ export url_site="https://linux-gaming.ru/portproton/" export url_cloud="https://cloud.linux-gaming.ru/portproton" export url_git="https://git.linux-gaming.ru/CastroFidel/PortWINE" ######################################################################## +if [[ "${START_FROM_FLATPAK:-0}" == 1 ]] && [[ -z "${STEAM_COMPAT_DATA_PATH:-}" ]] && command -v "flatpak" &>/dev/null; then + unset START_FROM_FLATPAK + flatpak run ru.linux_gaming.PortProton "$@" + exit +fi echo ' █░░ █ █▄░█ █░█ ▀▄▀ ▄▄ █▀▀ ▄▀█ █▀▄▀█ █ █▄░█ █▀▀ ░ █▀█ █░█ █▄▄ █ █░▀█ █▄█ █░█ ░░ █▄█ █▀█ █░▀░█ █ █░▀█ █▄█ ▄ █▀▄ █▄█ @@ -96,7 +101,7 @@ 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 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 PW_WINE_CPU_TOPOLOGY +unset PW_PREFIX_NAME VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR PW_WINE_CPU_TOPOLOGY 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_TERM PW_EXEC_FROM_DESKTOP WEBKIT_DISABLE_DMABUF_RENDERER PW_AMD_VULKAN_USE PW_VK_ICD_FILENAMES LAUNCH_URI @@ -115,15 +120,14 @@ echo "" > "${PW_TMPFS_PATH}/tmp_yad_form" echo "" > "${PW_TMPFS_PATH}/tmp_yad_form_vulkan" create_new_dir "${PORT_WINE_PATH}/data/dist" -pushd "${PORT_WINE_PATH}/data/dist/" 1>/dev/null || fatal -for dist_dir in ./* ; do - [[ -d "$dist_dir" ]] || continue - dist_dir_new="${dist_dir//[[:blank:]]/_}" +IFS=$'\n' +for dist_dir in $(ls -1 "${PORT_WINE_PATH}/data/dist") ; do + dist_dir_new=$(echo "${dist_dir}" | awk '$1=$1' | sed -e s/[[:blank:]]/_/g) if [[ ! -d "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" ]] ; then mv -- "${PORT_WINE_PATH}/data/dist/$dist_dir" "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" fi done -popd 1>/dev/null || fatal +IFS="$orig_IFS" create_new_dir "${PORT_WINE_PATH}/data/prefixes/DEFAULT" create_new_dir "${PORT_WINE_PATH}/data/prefixes/DOTNET" @@ -163,7 +167,10 @@ export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" try_remove_dir "${PW_WINELIB}/var" install_ver="$(<"${PORT_WINE_TMP_PATH}/PortProton_ver")" export install_ver -scripts_install_ver="$(<"${PORT_WINE_TMP_PATH}/scripts_ver")" +if [[ -f "${PORT_WINE_TMP_PATH}/scripts_ver" ]] +then scripts_install_ver="$(<"${PORT_WINE_TMP_PATH}/scripts_ver")" +else scripts_install_ver="2025" +fi export scripts_install_ver export WINETRICKS_DOWNLOADER="curl" export USER_CONF="${PORT_WINE_PATH}/data/user.conf" @@ -191,6 +198,12 @@ if [[ $TRANSLATIONS_VER != "$scripts_install_ver" ]] ; then source "$PW_CACHE_LANG_PATH/$LANGUAGE" fi +if [[ -n "${STEAM_COMPAT_DATA_PATH:-}" ]]; then + steamplay_launch "${@:2}" + exit +fi +unset WINEPREFIX + # check PortProton theme if [[ -n "$GUI_THEME" ]] \ && [[ -f "$PW_GUI_THEMES_PATH/$GUI_THEME.pptheme" ]] @@ -645,6 +658,12 @@ else fi [[ $line1 =~ ^Icon= ]] && PW_ICON_PATH["$AMOUNT_GENERATE_BUTTONS"]=${line1//Icon=/} done < "$desktop_file" + if fix_icon_name_png "${PW_ICON_PATH["$AMOUNT_GENERATE_BUTTONS"]}" "$desktop_file" ; then + ICON_NAME_REGEX=(\! % \$ \& \<) + for i in "${ICON_NAME_REGEX[@]}" ; do + PW_ICON_PATH["$AMOUNT_GENERATE_BUTTONS"]="${PW_ICON_PATH["$AMOUNT_GENERATE_BUTTONS"]//$i/}" + done + fi PW_ALL_DF["$AMOUNT_GENERATE_BUTTONS"]="$desktop_file_new" # Для конвертации существующих .desktop файлов flatpak в натив и наоборот if [[ ${PW_NAME_D_ICON["$AMOUNT_GENERATE_BUTTONS"]} =~ ^"Exec=flatpak run ru.linux_gaming.PortProton " ]] ; then @@ -702,20 +721,6 @@ else for dp in "${PW_AMOUNT_NEW_DESKTOP[@]}" "${PW_AMOUNT_OLD_DESKTOP[@]}" ; do PW_DESKTOP_FILES="${PW_ALL_DF[$dp]}" PW_DESKTOP_FILES_SHOW="$PW_DESKTOP_FILES" - PW_ICON_PATH[dp]=${PW_ICON_PATH[dp]%.png} - PW_NAME_D_ICON_NEW="${PW_NAME_D_ICON[dp]//\"/}" - - PW_NAME_D_ICON_128="${PW_ICON_PATH[dp]}" - resize_png "$PW_NAME_D_ICON_NEW" "${PW_NAME_D_ICON_128//"${PORT_WINE_PATH}/data/img/"/}" "128" - if [[ $PW_DESKTOP_FILES =~ [\!\%\$\&\<] || ${PW_ICON_PATH[dp]} =~ [\!\%\$\&\<] ]] ; then - PW_DESKTOP_FILES_SHOW_REGEX=(\! % \$ \& \<) - for i in "${PW_DESKTOP_FILES_SHOW_REGEX[@]}" ; do - PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES_SHOW//$i/}" - PW_ICON_PATH[dp]="${PW_ICON_PATH[dp]//$i/}" - done - fi - PW_NAME_D_ICON_48="${PW_ICON_PATH[dp]}_48" - resize_png "$PW_NAME_D_ICON_NEW" "${PW_NAME_D_ICON_48//"${PORT_WINE_PATH}/data/img/"/}" "48" if [[ $PW_DESKTOP_FILES =~ [\(\)\!\$\%\&\`\'\"\>\<\\\|\;] ]] ; then PW_DESKTOP_FILES_REGEX=(\( \) \! \$ % \& \` \' \" \> \< \\ \| \;) @@ -726,7 +731,19 @@ else done fi - PW_GENERATE_BUTTONS+="--field= $(print_wrapped "${PW_DESKTOP_FILES_SHOW//".desktop"/""}" "25" "...")!${PW_NAME_D_ICON_48}.png!:FBTNR%@bash -c \"button_click --desktop "${PW_DESKTOP_FILES// /#@_@#}"\"%" + if [[ $PW_DESKTOP_FILES_SHOW =~ [\!\%\$\&\<] ]] ; then + PW_DESKTOP_FILES_SHOW_REGEX=(\! % \$ \& \<) + for i in "${PW_DESKTOP_FILES_SHOW_REGEX[@]}" ; do + PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES_SHOW//$i/}" + done + fi + + PW_ICON_PATH[dp]=${PW_ICON_PATH[dp]%.png} + PW_NAME_D_ICON_NEW="${PW_NAME_D_ICON[dp]//\"/}" + + resize_png "$PW_NAME_D_ICON_NEW" "${PW_ICON_PATH[dp]//"${PORT_WINE_PATH}/data/img/"/}" "48" "128" + + PW_GENERATE_BUTTONS+="--field= $(print_wrapped "${PW_DESKTOP_FILES_SHOW//".desktop"/""}" "25" "...")!${PW_ICON_PATH[dp]}_48.png!:FBTNR%@bash -c \"button_click --desktop "${PW_DESKTOP_FILES// /#@_@#}"\"%" done if [[ $AMOUNT_GENERATE_BUTTONS == 1 ]] ; then diff --git a/data_from_portwine/scripts/thanks b/data_from_portwine/scripts/thanks index 4bae4b2e..6566e64f 100644 --- a/data_from_portwine/scripts/thanks +++ b/data_from_portwine/scripts/thanks @@ -4,9 +4,10 @@ credits_devel () { echo " Boria138 Vano Majukin Eljeyna - chal55rus + minergenon (chal55rus) SDR Mels + alex2844 Cefeiko Dezert1r Taz_mania diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index d231c437..32f4d310 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,7 +1,7 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2385 -#SCRIPTS_STABLE_VERSION=2385 +#SCRIPTS_NEXT_VERSION=2388 +#SCRIPTS_STABLE_VERSION=2388 ######################################################################## export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT" # export PROTON_USE_XALIA="1" @@ -55,9 +55,9 @@ export PW_VULKAN_USE="2" export VKD3D_LIMIT_TESS_FACTORS="64" export DXVK_LEGACY_VER="1.6.1" export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.5.2-1" +export DXVK_GIT_VER="2.5.3-31" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-4326" +export VKD3D_GIT_VER="1.1-4367" ###VKBASALT### export PW_VKBASALT_EFFECTS="Curves:cas" export PW_VKBASALT_FFX_CAS="0.50"