diff --git a/data_from_portwine/dxvk.conf b/data_from_portwine/dxvk.conf index 2c68c9e..4d1861d 100755 --- a/data_from_portwine/dxvk.conf +++ b/data_from_portwine/dxvk.conf @@ -36,7 +36,7 @@ # # Supported values: True, False -# dxgi.nvapiHack = True +dxgi.nvapiHack = True # Override maximum amount of device memory and shared system memory diff --git a/data_from_portwine/filelock.py b/data_from_portwine/filelock.py old mode 100644 new mode 100755 diff --git a/data_from_portwine/port_on b/data_from_portwine/port_on index 0fe1887..ed7a6b9 100755 --- a/data_from_portwine/port_on +++ b/data_from_portwine/port_on @@ -265,7 +265,7 @@ class Session: self.log_file = None self.env = dict(os.environ) self.dlloverrides = { - "steam.exe": "" + "steam.exe": "n" } self.compat_config = set() diff --git a/data_from_portwine/scripts/clean_port b/data_from_portwine/scripts/clean_port new file mode 100755 index 0000000..e65b59a --- /dev/null +++ b/data_from_portwine/scripts/clean_port @@ -0,0 +1,12 @@ +#!/bin/bash +# Author: PortWINE-Linux.ru +. "$(dirname $(readlink -f "$0"))/runlib" +########################################################## +rm -f "${PORT_WINE_PATH}/data/version" +rm -f "${PORT_WINE_PATH}/data/"*.lock +rm -fr "${PORT_WINE_PATH}/data/__pycache__" +rm -fr "${PORT_WINE_PATH}/data/pfx/dosdevices" +rm -fr "${PORT_WINE_PATH}/data/dive_c/windows/Installer/"* +rm -fr "${PORT_WINE_PATH}/data/dive_c/windows/temp/"* +rm -fr "${PORT_WINE_PATH}/data/dive_c/users/steamuser/Local Settings/Temporary Internet Files/"* +rm -fr "${PORT_WINE_PATH}/data/dive_c/users/steamuser/Temp/"* diff --git a/data_from_portwine/scripts/create_shortcut b/data_from_portwine/scripts/create_shortcut index 704512d..3aad395 100755 --- a/data_from_portwine/scripts/create_shortcut +++ b/data_from_portwine/scripts/create_shortcut @@ -19,13 +19,13 @@ cp -f "${PORTPROTON_IMG}" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" name_desktop="${PORTPROTON_NAME}" echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Name=${PORTPROTON_NAME}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" -echo "Exec="export PATH_TO_GAME=\""$PORTPROTON_PATH"\" \&\& sh \"${PORT_WINE_PATH}/data/scripts/start\" \"${PORTPROTON_EXE}\""" \ +echo "Exec="export PATH_TO_GAME=\""$PORTPROTON_PATH"\" \&\& \"${PORT_WINE_PATH}/data/scripts/start\" \"${PORTPROTON_EXE}\""" \ >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Path="${PORT_WINE_PATH}/data/scripts/"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Icon="${PORTPROTON_IMG}"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" -chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop" +chmod +x "${PORT_WINE_PATH}/${name_desktop}.desktop" ######################################################################## `zenity --info --title "Успешно." --text "Ярлык создан в корневом каталоге порта." --no-wrap ` > /dev/null 2>&1 diff --git a/data_from_portwine/scripts/setup b/data_from_portwine/scripts/setup index 69882da..27a5975 100755 --- a/data_from_portwine/scripts/setup +++ b/data_from_portwine/scripts/setup @@ -14,7 +14,7 @@ if [ ! -z ${gamename} ]; then name_desktop="${gamename}" echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" - echo "Exec="${PORT_WINE_PATH}/data/scripts/start"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" + echo "Exec=sh "${PORT_WINE_PATH}/data/scripts/start"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" @@ -40,7 +40,7 @@ for name_desktop in "winecfg" "winefile" "winecmd" "winereg" "create_shortcut" do echo ""[Desktop Entry]" "Name=${name_desktop}" -"Exec="${PORT_WINE_PATH}/data/scripts/${name_desktop}"" +"Exec=sh "${PORT_WINE_PATH}/data/scripts/${name_desktop}"" "Type=Application" "Categories=Game" "StartupNotify=true" @@ -53,7 +53,7 @@ for name_desktop in "debug" "reset" do echo ""[Desktop Entry]" "Name=${name_desktop}" - "Exec="${PORT_WINE_PATH}/data/scripts/${name_desktop}"" + "Exec=sh "${PORT_WINE_PATH}/data/scripts/${name_desktop}"" "Type=Application" "Categories=Game" "StartupNotify=true" @@ -64,7 +64,7 @@ done echo ""[Desktop Entry]" "Name=winetricks" -"Exec="${PORT_WINE_PATH}/data/scripts/remove"" +"Exec=sh "${PORT_WINE_PATH}/data/scripts/remove"" "Type=Application" "Categories=Game" "StartupNotify=true" @@ -74,7 +74,7 @@ chmod u+x "${PORT_WINE_PATH}/Settings/remove.desktop" echo ""[Desktop Entry]" "Name=winetricks" -"Exec="${PORT_WINE_PATH}/data/scripts/winetricks-q-force"" +"Exec=sh "${PORT_WINE_PATH}/data/scripts/winetricks-q-force"" "Type=Application" "Categories=Game" "StartupNotify=true" @@ -83,11 +83,21 @@ echo ""[Desktop Entry]" chmod u+x "${PORT_WINE_PATH}/Settings/winetricks.desktop" chmod u+x "${PORT_WINE_PATH}/data/scripts/"* -ln -s "${PORT_WINE_PATH}/data/pfx/drive_c/" "${PORT_WINE_PATH}/drive_c" + +if [ ! -d "${PORT_WINE_PATH}/drive_c" ]; then + ln -s "${PORT_WINE_PATH}/data/pfx/drive_c/" "${PORT_WINE_PATH}/drive_c" +fi sed -i "s/xuser/${USER}/g" "${PORT_WINE_PATH}/data/pfx/"*.reg -rm -f "${PATH_TO_GAME}"/*.dxvk-cache +if [ ! -z "${PATH_TO_GAME}" ]; then + rm -f "${PATH_TO_GAME}"/*.dxvk-cache +fi + +if [ -f "${PORT_WINE_PATH}/restart.desktop" ]; then + rm "${PORT_WINE_PATH}/restart.desktop" +fi + ADD_IN_POST_INSTALL xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 diff --git a/data_from_portwine/scripts/vars b/data_from_portwine/scripts/vars index 7187141..32ad0ab 100755 --- a/data_from_portwine/scripts/vars +++ b/data_from_portwine/scripts/vars @@ -18,9 +18,9 @@ export PW_LOG=0 export PW_ACO=1 export PW_NO_VR=1 export PW_FILELOCK=1 -export PW_DXVK_ASYNC=0 -export PW_USE_SECCOMP=1 -export PW_NO_WINEMFPLAY=1 +export PW_DXVK_ASYNC=1 +export PW_USE_SECCOMP=0 +export PW_NO_WINEMFPLAY=0 export PW_NVAPI_DISABLE=1 export PW_NO_WRITE_WATCH=1 export PW_WINEDBG_DISABLE=1