diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 59b9cfb..ba1f4c1 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,12 @@ ----------------------------------------- История изменений: +###Scripts version 2326### / Дата: 22.07.2024 / Размер скачиваемого обновления: 4 мегабайта +* обновлен README.md (спасибо Kazevic) +* редактор user.conf переключен на yad (спасибо Htylol) +* исправлена работа монтирования дисков в dosdevice (спасибо Boria138) +* добавлен диск S который всегда ссылается на каталог с играми в STEAM (для удобства установки русификаторов и модов в игры из библиотеки STEAM) + ###Scripts version 2325### / Дата: 22.07.2024 / Размер скачиваемого обновления: 4 мегабайта * обновлена автоустановка Caliber * исправлено отображение иконки Yabause diff --git a/data_from_portwine/img/setup.png b/data_from_portwine/img/setup.png new file mode 100644 index 0000000..438ac77 Binary files /dev/null and b/data_from_portwine/img/setup.png differ diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 2de90f6..01710fd 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1225,6 +1225,12 @@ check_dirs_and_files_in_pfx () { [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:" [ ! -d "${WINEPREFIX}/dosdevices/h:" ] && try_force_link_dir "$HOME" "${WINEPREFIX}/dosdevices/h:" + if [ ! -d "${WINEPREFIX}/dosdevices/s:" ] \ + && [ -d "$HOME/.local/share/Steam/steamapps/common/" ] + then + try_force_link_dir "$HOME/.local/share/Steam/steamapps/common/" "${WINEPREFIX}/dosdevices/s:" + fi + create_new_dir "${WINEPREFIX}/drive_c/windows/Fonts/" LN_FONTS="arialbd.ttf courbd.ttf georgia.ttf micross.ttf msyh.ttf simsun.ttc arial.ttf cour.ttf malgun.ttf msgothic.ttc nirmala.ttf times.ttf" for link_font in $LN_FONTS ; do @@ -1255,7 +1261,7 @@ check_dirs_and_files_in_pfx () { then try_force_link_dir "${WINEPREFIX}/drive_c/users/steamuser/AppData/Local" "${WINEPREFIX}/drive_c/users/steamuser/Local Settings/Application Data" fi - DRIVES=(d e f g i j k l m n o p q r s t u v w x y) + DRIVES=(d e f g i j k l m n o p q r t u v w x y) DEF_MOUNT_DIRS=('/media' '/mnt' '/run/media') MOUNT_DIRS=($(find "${DEF_MOUNT_DIRS[@]}" -maxdepth 1 -mindepth 1 -type d 2>/dev/null | sort -u)) @@ -1594,6 +1600,11 @@ edit_user_conf_from_gui () { } pw_create_gui_png () { + if echo "$(basename "${portwine_exe}")" | grep -i "setup\|install" &>/dev/null ; then + export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png" + return 0 + fi + if [[ -z "$PORTPROTON_NAME" ]] \ || [[ "$PW_NO_RESTART_PPDB" == "1" ]] then @@ -1627,8 +1638,6 @@ pw_create_gui_png () { edit_db_from_gui PORTPROTON_NAME fi PW_RESIZE_TO="128" - try_remove_file "${PORT_WINE_PATH}/data/img/setup.png" - try_remove_file "${PORT_WINE_PATH}/data/img/Setup.png" try_remove_file "${PORT_WINE_PATH}/data/img/launcher.png" try_remove_file "${PORT_WINE_PATH}/data/img/Launcher.png" if [[ ! -f "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" ]] ; then diff --git a/data_from_portwine/scripts/portwine_db/setup.ppdb b/data_from_portwine/scripts/portwine_db/setup.ppdb index 5eef087..533a57d 100644 --- a/data_from_portwine/scripts/portwine_db/setup.ppdb +++ b/data_from_portwine/scripts/portwine_db/setup.ppdb @@ -1,13 +1,10 @@ #!/usr/bin/env bash #Author: linux-gaming.ru #setup.exe -#Setup.exe -#SETUP.exe #.msi #Rating=5 ################################################ export PW_DISABLED_CREATE_DB=1 -export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png" export PW_VULKAN_USE=1 export PW_MANGOHUD=0 export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.