Skip to content

P
PortWINE
Commit b215c387 authored by Mikhail Tergoev's avatar Mikhail Tergoev
Browse files
Options

fixed gui_proton_downloader

parent e2dd9ead
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 23 deletions
data_from_portwine/scripts/functions_helper
View file @ b215c387
...@@ -78,7 +78,7 @@ generate_pot () { ...@@ -78,7 +78,7 @@ generate_pot () {
for lang in $LANGUAGES_LIST for lang in $LANGUAGES_LIST
do do
echo "${lang}" echo "${lang}"
mkdir -p "${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/" create_new_dir "${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/"
LANG_PO="${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/PortProton.po" LANG_PO="${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/PortProton.po"
LANG_MO="${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/PortProton.mo" LANG_MO="${PORT_WINE_PATH}/data/locales/${lang}/LC_MESSAGES/PortProton.mo"
TEMPLATE_POT="${PORT_WINE_PATH}/data/locales/PortProton.pot" TEMPLATE_POT="${PORT_WINE_PATH}/data/locales/PortProton.pot"
...@@ -136,6 +136,13 @@ try_remove_dir () { ...@@ -136,6 +136,13 @@ try_remove_dir () {
} }
export -f try_remove_dir export -f try_remove_dir
create_new_dir () {
if [ ! -d "$1" ] ; then
mkdir -p "$1"
fi
return 0
}
try_force_link_file () { try_force_link_file () {
if [ ! -f "$1" ] ; then : if [ ! -f "$1" ] ; then :
elif [ -z "$2" ] ; then print_error "no way to link file $1" elif [ -z "$2" ] ; then print_error "no way to link file $1"
...@@ -246,13 +253,6 @@ try_download () { ...@@ -246,13 +253,6 @@ try_download () {
return 0 return 0
} }
create_new_dir () {
if [ ! -d "$1" ] ; then
mkdir -p "$1"
fi
return 0
}
var_winedlloverride_update () { var_winedlloverride_update () {
if [ ! -z "$WINEDLLOVERRIDES" ] if [ ! -z "$WINEDLLOVERRIDES" ]
then export WINEDLLOVERRIDES="$1;$WINEDLLOVERRIDES" then export WINEDLLOVERRIDES="$1;$WINEDLLOVERRIDES"
...@@ -1906,7 +1906,7 @@ start_portwine () { ...@@ -1906,7 +1906,7 @@ start_portwine () {
fi fi
pw_other_fixes pw_other_fixes
#enabled BattleEye_Runtime and EasyAntiCheat_Runtime # enabled BattleEye_Runtime and EasyAntiCheat_Runtime
if [[ "${PW_USE_EAC_AND_BE}" == 1 ]] ; then if [[ "${PW_USE_EAC_AND_BE}" == 1 ]] ; then
export PROTON_BATTLEYE_RUNTIME="${PW_PLUGINS_PATH}/BattlEye_Runtime" export PROTON_BATTLEYE_RUNTIME="${PW_PLUGINS_PATH}/BattlEye_Runtime"
export PROTON_EAC_RUNTIME="${PW_PLUGINS_PATH}/EasyAntiCheat_Runtime" export PROTON_EAC_RUNTIME="${PW_PLUGINS_PATH}/EasyAntiCheat_Runtime"
...@@ -2980,6 +2980,7 @@ A brief instruction: ...@@ -2980,6 +2980,7 @@ A brief instruction:
} }
gui_proton_downloader () { gui_proton_downloader () {
unset VERSION_WINE_GIT VERSION_INSTALLED_WINE URL_VERSION_PROTON_GIT GIVE_WINE_URL
if [[ "$PW_WINE_USE" == PROTON_LG ]] if [[ "$PW_WINE_USE" == PROTON_LG ]]
then PW_WINE_USE="${PW_PROTON_LG_VER}" then PW_WINE_USE="${PW_PROTON_LG_VER}"
elif [[ "$PW_WINE_USE" == WINE_*_LG ]] || [[ "$PW_WINE_USE" == WINE_LG ]] elif [[ "$PW_WINE_USE" == WINE_*_LG ]] || [[ "$PW_WINE_USE" == WINE_LG ]]
...@@ -3782,7 +3783,9 @@ portwine_start_debug () { ...@@ -3782,7 +3783,9 @@ portwine_start_debug () {
echo "Scripts version:" >> "${PORT_WINE_PATH}/PortProton.log" echo "Scripts version:" >> "${PORT_WINE_PATH}/PortProton.log"
cat "${PORT_WINE_TMP_PATH}/scripts_ver" >> "${PORT_WINE_PATH}/PortProton.log" cat "${PORT_WINE_TMP_PATH}/scripts_ver" >> "${PORT_WINE_PATH}/PortProton.log"
echo "-----------------------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log" echo "-----------------------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log"
if [ "${PW_USE_RUNTIME}" = 0 ] ; then if check_flatpak ; then
echo "FLATPAK in used" >> "${PORT_WINE_PATH}/PortProton.log"
elif [ "${PW_USE_RUNTIME}" = 0 ] ; then
echo "RUNTIME is disabled" >> "${PORT_WINE_PATH}/PortProton.log" echo "RUNTIME is disabled" >> "${PORT_WINE_PATH}/PortProton.log"
else else
echo "RUNTIME is enabled" >> "${PORT_WINE_PATH}/PortProton.log" echo "RUNTIME is enabled" >> "${PORT_WINE_PATH}/PortProton.log"
...@@ -3843,22 +3846,22 @@ portwine_start_debug () { ...@@ -3843,22 +3846,22 @@ portwine_start_debug () {
uname -r >> "${PORT_WINE_PATH}/PortProton.log" uname -r >> "${PORT_WINE_PATH}/PortProton.log"
echo "-------------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log" echo "-------------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log"
echo "CPU:" >> "${PORT_WINE_PATH}/PortProton.log" echo "CPU:" >> "${PORT_WINE_PATH}/PortProton.log"
echo "CPU physical cores:$(cat /proc/cpuinfo | grep 'cpu cores' | sort -u | cut -d':' -f2)" >> "${PORT_WINE_PATH}/PortProton.log" echo "CPU physical cores:$(grep 'cpu cores' /proc/cpuinfo | sort -u | cut -d':' -f2)" >> "${PORT_WINE_PATH}/PortProton.log"
echo "CPU logical cores: $(cat /proc/cpuinfo | grep 'processor' | wc -l)" >> "${PORT_WINE_PATH}/PortProton.log" echo "CPU logical cores: $(grep 'processor' /proc/cpuinfo | wc -l)" >> "${PORT_WINE_PATH}/PortProton.log"
echo "CPU model name:$(cat /proc/cpuinfo | grep 'model name' | sort -u | cut -d':' -f2)" >> "${PORT_WINE_PATH}/PortProton.log" echo "CPU model name:$(grep 'model name' /proc/cpuinfo | sort -u | cut -d':' -f2)" >> "${PORT_WINE_PATH}/PortProton.log"
echo "------------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log" echo "------------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log"
echo "RAM:" >> "${PORT_WINE_PATH}/PortProton.log" echo "RAM:" >> "${PORT_WINE_PATH}/PortProton.log"
free -m >> "${PORT_WINE_PATH}/PortProton.log" free -m >> "${PORT_WINE_PATH}/PortProton.log"
echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log" echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/PortProton.log"
echo "Graphic cards and drivers:" >> "${PORT_WINE_PATH}/PortProton.log" echo "Graphic cards and drivers:" >> "${PORT_WINE_PATH}/PortProton.log"
echo 'lspci -k | grep -EA3 VGA|3D|Display :' >> "${PORT_WINE_PATH}/PortProton.log" echo 'lspci -k | grep -EA3 VGA|3D|Display :' >> "${PORT_WINE_PATH}/PortProton.log"
echo "$(lspci -k | grep -EA3 'VGA|3D|Display')" >> "${PORT_WINE_PATH}/PortProton.log" lspci -k | grep -EA3 'VGA|3D|Display' >> "${PORT_WINE_PATH}/PortProton.log"
echo "----" >> "${PORT_WINE_PATH}/PortProton.log" echo "----" >> "${PORT_WINE_PATH}/PortProton.log"
[[ `command -v glxinfo` ]] && glxinfo -B >> "${PORT_WINE_PATH}/PortProton.log" command -v glxinfo &>/dev/null && glxinfo -B >> "${PORT_WINE_PATH}/PortProton.log"
echo "-----" >> "${PORT_WINE_PATH}/PortProton.log" echo "-----" >> "${PORT_WINE_PATH}/PortProton.log"
echo "inxi -G:" >> "${PORT_WINE_PATH}/PortProton.log" echo "inxi -G:" >> "${PORT_WINE_PATH}/PortProton.log"
if ! check_flatpak if ! check_flatpak ; then
then "${PW_PLUGINS_PATH}/portable/bin/inxi" -Gc0 >> "${PORT_WINE_PATH}/PortProton.log" "${PW_PLUGINS_PATH}/portable/bin/inxi" -Gc0 >> "${PORT_WINE_PATH}/PortProton.log"
fi fi
if echo "$LSPCI_VGA" | grep -i nvidia &>/dev/null ; then if echo "$LSPCI_VGA" | grep -i nvidia &>/dev/null ; then
if command -v ldconfig &>/dev/null ; then if command -v ldconfig &>/dev/null ; then
...@@ -3932,7 +3935,7 @@ portwine_start_debug () { ...@@ -3932,7 +3935,7 @@ portwine_start_debug () {
sed -i '/wine: RLIMIT_NICE is <= 20/d' "${PORT_WINE_PATH}/PortProton.log" sed -i '/wine: RLIMIT_NICE is <= 20/d' "${PORT_WINE_PATH}/PortProton.log"
sed -i '/ALT_2.24/d' "${PORT_WINE_PATH}/PortProton.log" sed -i '/ALT_2.24/d' "${PORT_WINE_PATH}/PortProton.log"
sed -i '/UDEV monitor/d' "${PORT_WINE_PATH}/PortProton.log" sed -i '/UDEV monitor/d' "${PORT_WINE_PATH}/PortProton.log"
deb_text=$(cat "${PORT_WINE_PATH}/PortProton.log" | awk '! a[$0]++') deb_text=$(awk '! a[$0]++' "${PORT_WINE_PATH}/PortProton.log")
echo "$deb_text" > "${PORT_WINE_PATH}/PortProton.log" echo "$deb_text" > "${PORT_WINE_PATH}/PortProton.log"
"$pw_yad" --title="PortProton.log" --no-buttons --text-align=center \ "$pw_yad" --title="PortProton.log" --no-buttons --text-align=center \
--text-info --show-uri --wrap --width=1200 --height=550 --uri-color=red \ --text-info --show-uri --wrap --width=1200 --height=550 --uri-color=red \
......
data_from_portwine/scripts/pw_autoinstall/PW_EAAPP
View file @ b215c387
...@@ -14,7 +14,7 @@ if try_download "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/instal ...@@ -14,7 +14,7 @@ if try_download "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/instal
then then
pw_start_progress_bar_install_game "EA Launcher." pw_start_progress_bar_install_game "EA Launcher."
pw_kill_autostart EABackgroundSer 5 please & pw_kill_autostart EABackgroundSer 5 please &
mkdir -p "$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop" create_new_dir "$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop"
pw_run "${PW_AUTOINSTALL_EXE}" pw_run "${PW_AUTOINSTALL_EXE}"
portwine_exe="$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop/EALauncher.exe" portwine_exe="$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop/EALauncher.exe"
pw_stop_progress_bar pw_stop_progress_bar
......
data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2
View file @ b215c387
...@@ -7,7 +7,7 @@ export WINEDLLOVERRIDES="mscoree,mshtml=" ...@@ -7,7 +7,7 @@ export WINEDLLOVERRIDES="mscoree,mshtml="
export PW_MUST_HAVE_DLL="" export PW_MUST_HAVE_DLL=""
start_portwine start_portwine
mkdir -p "${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/" create_new_dir "${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/"
export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/Gw2Setup-64.exe" export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/Gw2Setup-64.exe"
if try_download "https://s3.amazonaws.com/gw2cdn/client/branches/Gw2Setup-64.exe" "${PW_AUTOINSTALL_EXE}" no_mirror if try_download "https://s3.amazonaws.com/gw2cdn/client/branches/Gw2Setup-64.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
......
data_from_portwine/scripts/pw_autoinstall/PW_OSU
View file @ b215c387
...@@ -6,7 +6,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="OSU" ...@@ -6,7 +6,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="OSU"
start_portwine start_portwine
mkdir -p "${WINEPREFIX}/drive_c/Program Files (x86)/OSU/" create_new_dir "${WINEPREFIX}/drive_c/Program Files (x86)/OSU/"
export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files (x86)/OSU/osu!.exe" export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files (x86)/OSU/osu!.exe"
if try_download "https://m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" no_mirror if try_download "https://m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
......
data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE
View file @ b215c387
...@@ -6,7 +6,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Pulse Online" ...@@ -6,7 +6,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Pulse Online"
start_portwine start_portwine
mkdir -p "${WINEPREFIX}/drive_c/games/PulseOnline/" create_new_dir "${WINEPREFIX}/drive_c/games/PulseOnline/"
export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/games/PulseOnline/PulseOnlineLauncher.exe" export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/games/PulseOnline/PulseOnlineLauncher.exe"
if try_download "https://pulseonline.ru/game_download/PulseOnlineLauncher.exe" "${PW_AUTOINSTALL_EXE}" no_mirror if try_download "https://pulseonline.ru/game_download/PulseOnlineLauncher.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
......
data_from_portwine/scripts/pw_autoinstall/PW_RUSSIAN_FISHING
View file @ b215c387
...@@ -9,7 +9,7 @@ export PW_PREFIX_NAME="RUSSIAN_FISHING" ...@@ -9,7 +9,7 @@ export PW_PREFIX_NAME="RUSSIAN_FISHING"
start_portwine start_portwine
if try_download "https://cdn6.rf4game.ru/rf4/RF4SetupRU.exe" "${PW_AUTOINSTALL_EXE}" no_mirror if try_download "https://cdn6.rf4game.ru/rf4/RF4SetupRU.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
then then
mkdir -p "${WINEPREFIX}/drive_c/games/Russian Fishing 4" create_new_dir "${WINEPREFIX}/drive_c/games/Russian Fishing 4"
mv "${PW_USER_TEMP}/RF4SetupRU.exe" "${WINEPREFIX}/drive_c/games/Russian Fishing 4/RF4.exe" mv "${PW_USER_TEMP}/RF4SetupRU.exe" "${WINEPREFIX}/drive_c/games/Russian Fishing 4/RF4.exe"
portwine_exe="${WINEPREFIX}/drive_c/games/Russian Fishing 4/RF4.exe" portwine_exe="${WINEPREFIX}/drive_c/games/Russian Fishing 4/RF4.exe"
kill_portwine kill_portwine
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment