Commit 66d9182c authored by Mikhail Tergoev's avatar Mikhail Tergoev

Add try_ and check_ function. Fix Unarc.dll in setup db

parent 290a6840
...@@ -22,6 +22,6 @@ export PW_WINEDBG_DISABLE=1 ...@@ -22,6 +22,6 @@ export PW_WINEDBG_DISABLE=1
export PW_FORCE_DISABLED_GAMEMOD=1 # Force disabele gamemod export PW_FORCE_DISABLED_GAMEMOD=1 # Force disabele gamemod
export PW_FORCE_LARGE_ADDRESS_AWARE=0 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. export PW_FORCE_LARGE_ADDRESS_AWARE=0 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
#export PULSE_LATENCY_MSEC=60 #export PULSE_LATENCY_MSEC=60
export PW_DLL_INSTALL="vcrun6 mfc42" export PW_DLL_INSTALL="vcrun6 mfc42 vcrun6sp6 7zip"
#export LAUNCH_PARAMETERS="-d3d9" #export LAUNCH_PARAMETERS="-d3d9"
export PW_GUI_DISABLED_CS=1 export PW_GUI_DISABLED_CS=1
...@@ -9,44 +9,111 @@ echo ' ...@@ -9,44 +9,111 @@ echo '
█────████─█─█───█───█─█──███─█──█─███ █────████─█─█───█───█─█──███─█──█─███
' '
########################################################################
[ $(id -u) = 0 ] && echo "Do not run this script as root!" && zenity --error --text "Do not run this script as root!" && exit 1 [ $(id -u) = 0 ] && echo "Do not run this script as root!" && zenity --error --text "Do not run this script as root!" && exit 1
if [ "${s_install}" != "1" ] && [ ! -x "`which "zenity" 2>/dev/null`" ];then if [ "${s_install}" != "1" ] && [ ! -x "`which "zenity" 2>/dev/null`" ];then
echo "You will need to install: zenity, and restart the port." echo "You will need to install: zenity, and restart the port."
xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0
fi fi
########################################################################
try_copy_file () {
if [ ! -f "$1" ] ; then
echo "INFO: file $1 not found for copy"
elif [ -z "$2" ] ; then
echo "ERROR: no way to copy file $1"
else
cp -f "$1" "$2"
[ "$?" != 0 ] && echo "ERROR: failed to copy file $1 to $2" || return 0
fi
}
try_copy_dir () {
if [ ! -d "$1" ] ; then
echo "INFO: directory $1 not found for copy"
elif [ -z "$2" ] ; then
echo "ERROR: no way to copy directory $1"
else
cp -fr "$1" "$2"
[ "$?" != 0 ] && echo "ERROR: failed to copy directory $1 to $2" || return 0
fi
}
try_remove_file () {
if [ ! -f "$1" ] ; then
echo "INFO: file $1 not found for remove"
else
rm -f "$1"
[ "$?" != 0 ] && echo "ERROR: failed to remove file $1" || return 0
fi
}
try_remove_dir () {
if [ ! -d "$1" ] ; then
echo "INFO: directory $1 not found for remove"
else
rm -fr "$1"
[ "$?" != 0 ] && echo "ERROR: failed to remove directory $1" || return 0
fi
}
try_force_link_file () {
if [ ! -f "$1" ] ; then
echo "INFO: file $1 not found for link"
elif [ -z "$2" ] ; then
echo "ERROR: no way to link file $1"
else
[ -f "$2" ] && rm -f "$2"
ln -s "$1" "$2"
[ "$?" != 0 ] && echo "ERROR: failed to link file $1 to $2" || return 0
fi
}
try_force_link_dir () {
if [ ! -d "$1" ] ; then
echo "INFO: directory $1 not found for link"
elif [ -z "$2" ] ; then
echo "ERROR: no way to link directory $1"
else
check_target_dir=`echo ${1} | awk -F/ '{print $NF}'`
[ -d "${2}${check_target_dir}" ] && rm -fr "${2}${check_target_dir}"
ln -s "$1" "$2"
[ "$?" != 0 ] && echo "ERROR: failed to link directory $1 to $2" || return 0
fi
}
try_download () {
wget -c -t 3 -T 2 "$1" --output-document="$2"
[ "$?" != 0 ] && echo "ERROR: failed to download $1. Scipping." || return 0
}
create_new_dir () {
if [ ! -d "$1" ] ; then
mkdir -p "$1"
fi
}
sszen() { sszen() {
zenity --progress --title="Settings..." --text="Updating parameters" --no-cancel --pulsate --auto-close --width 400 zenity --progress --title="Settings..." --text="Updating parameters" --no-cancel --pulsate --auto-close --width 400
} }
PW_START_PROGRESS_BAR () PW_START_PROGRESS_BAR () {
{
"${pw_yad}" --progress --progress-text="Start ${portname}... Please wait..." --pulsate --close-on-unfocus \ "${pw_yad}" --progress --progress-text="Start ${portname}... Please wait..." --pulsate --close-on-unfocus \
--no-buttons --undecorated --center --skip-taskbar --width=600 --wrap-width=500 & --no-buttons --undecorated --center --skip-taskbar --width=600 --wrap-width=500 &
export start_progress_yad_pid=$(echo $!) export start_progress_yad_pid=$(echo $!)
} }
PW_STOP_PROGRESS_BAR () PW_STOP_PROGRESS_BAR () {
{
if [ ! -z "${start_progress_yad_pid}" ] ; then if [ ! -z "${start_progress_yad_pid}" ] ; then
kill "${start_progress_yad_pid}" kill "${start_progress_yad_pid}"
fi fi
} }
export PW_WINDOWS_VER="7" export PW_WINDOWS_VER="7"
cd "$(dirname "`readlink -f "$0"`")" cd "$(dirname "`readlink -f "$0"`")" && export PORT_SCRIPTS_PATH="$(pwd)"
export PORT_SCRIPTS_PATH="$(pwd)" cd "${PORT_SCRIPTS_PATH}/../../" && export PORT_WINE_PATH="$(pwd)"
cd "${PORT_SCRIPTS_PATH}/../../"
export PORT_WINE_PATH="$(pwd)"
read "portname" < "${PORT_WINE_PATH}/data/tmp/portname"
export portname
cd "${PORT_SCRIPTS_PATH}"
. "${PORT_SCRIPTS_PATH}/vars/${portname}_vars"
export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp" export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
if [ ! -d "${PORT_WINE_TMP_PATH}" ]; then read "portname" < "${PORT_WINE_TMP_PATH}/portname" && export portname
mkdir -p "${PORT_WINE_TMP_PATH}" cd "${PORT_SCRIPTS_PATH}"
fi . "${PORT_SCRIPTS_PATH}/vars/${portname}_vars"
if [ ! -d "${HOME}/.PortWINE/tmp" ]; then create_new_dir "${PORT_WINE_TMP_PATH}"
mkdir -p "${HOME}/.PortWINE/tmp" create_new_dir "${HOME}/.PortWINE/tmp"
fi
if [ ! -e "${PORT_WINE_TMP_PATH}/${portname}_loc" ]; then if [ ! -e "${PORT_WINE_TMP_PATH}/${portname}_loc" ]; then
SET_LANG=`zenity --title "Install $portname" --text "Select the language" --list --radiolist \ SET_LANG=`zenity --title "Install $portname" --text "Select the language" --list --radiolist \
--column="Set:" --column "Language:" \ --column="Set:" --column "Language:" \
...@@ -95,7 +162,7 @@ if [ -f "${WINEDIR}"_vkd3d/version ]; then ...@@ -95,7 +162,7 @@ if [ -f "${WINEDIR}"_vkd3d/version ]; then
fi fi
if [ ! -e "${WINELIB}/run.sh" ] || [ ! -e "${WINELIB}/usr/bin/yad" ] || [ ! -e "${WINELIB}/amd64/usr/bin/vkcube" ] || [ ! -e "${WINELIB}/amd64/usr/bin/xterm" ]; then if [ ! -e "${WINELIB}/run.sh" ] || [ ! -e "${WINELIB}/usr/bin/yad" ] || [ ! -e "${WINELIB}/amd64/usr/bin/vkcube" ] || [ ! -e "${WINELIB}/amd64/usr/bin/xterm" ]; then
echo "Download and install libraries..." echo "Download and install libraries..."
wget -c -T 2 --output-document="${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" "${PW_FTP_URL}"/dist/libs${pw_libs_ver}.tar.xz | sszen && try_download "${PW_FTP_URL}/dist/libs${pw_libs_ver}.tar.xz" "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" | sszen &&
tar -Jxvf "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" -C "${HOME}/.PortWINE/" | sszen && tar -Jxvf "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" -C "${HOME}/.PortWINE/" | sszen &&
rm -f "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" rm -f "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz"
"${WINELIB}"/setup.sh --force "${WINELIB}"/setup.sh --force
...@@ -112,32 +179,19 @@ fi ...@@ -112,32 +179,19 @@ fi
if [ ! -d "${WINE_MONO_GECKO}/gecko" ] || [ ! -d "${WINE_MONO_GECKO}/mono" ] ; then if [ ! -d "${WINE_MONO_GECKO}/gecko" ] || [ ! -d "${WINE_MONO_GECKO}/mono" ] ; then
echo "######################################################" echo "######################################################"
echo "Download and install wine mono and gecko..." echo "Download and install wine mono and gecko..."
${PW_XTERM} wget -c -T 2 --output-document="${WINE_MONO_GECKO}.tar.xz" "${PW_FTP_URL}"/dist/mono_gecko${pw_gecko_mono_ver}.tar.xz try_download "${PW_FTP_URL}"/dist/mono_gecko${pw_gecko_mono_ver}.tar.xz "${WINE_MONO_GECKO}.tar.xz" | sszen &&
${PW_XTERM} tar -Jxvf "${WINE_MONO_GECKO}.tar.xz" -C "${HOME}/.PortWINE/" ${PW_XTERM} tar -Jxvf "${WINE_MONO_GECKO}.tar.xz" -C "${HOME}/.PortWINE/"
rm -f "${WINE_MONO_GECKO}.tar.xz" try_remove_file "${WINE_MONO_GECKO}.tar.xz"
fi
if [ ! -d "${WINEDIR}"/share/wine/ ]; then
mkdir -p "${WINEDIR}"/share/wine/
fi
if [ -d "${WINEDIR}"/share/wine/gecko ]; then
rm -fr "${WINEDIR}"/share/wine/gecko
fi
ln -s "${WINE_MONO_GECKO}"/gecko "${WINEDIR}"/share/wine/
if [ -d "${WINEDIR}"/share/wine/mono ]; then
rm -fr "${WINEDIR}"/share/wine/mono
fi fi
ln -s "${WINE_MONO_GECKO}"/mono "${WINEDIR}"/share/wine/ create_new_dir "${WINEDIR}/share/wine/"
try_force_link_dir "${WINE_MONO_GECKO}"/gecko "${WINEDIR}"/share/wine/
try_force_link_dir "${WINE_MONO_GECKO}"/mono "${WINEDIR}"/share/wine/
for pw_dist in "dxvk" "vkd3d" for pw_dist in "dxvk" "vkd3d"
do do
if [ -d "${WINEDIR}"_"${pw_dist}"/share/wine/ ]; then if [ -d "${WINEDIR}"_"${pw_dist}"/share/wine/ ]; then
if [ -d "${WINEDIR}"/share/wine/gecko ]; then try_force_link_dir "${WINEDIR}"/share/wine/gecko "${WINEDIR}"_"${pw_dist}"/share/wine/
rm -fr "${WINEDIR}"_"${pw_dist}"/share/wine/gecko try_force_link_dir "${WINEDIR}"/share/wine/mono "${WINEDIR}"_"${pw_dist}"/share/wine/
cp -fr "${WINEDIR}"/share/wine/gecko "${WINEDIR}"_"${pw_dist}"/share/wine/
fi
if [ -d "${WINEDIR}"/share/wine/mono ]; then
rm -fr "${WINEDIR}"_"${pw_dist}"/share/wine/mono
cp -fr "${WINEDIR}"/share/wine/mono "${WINEDIR}"_"${pw_dist}"/share/wine/
fi
fi fi
done done
if [ ! -z "${gamestart}" ]; then if [ ! -z "${gamestart}" ]; then
...@@ -178,8 +232,7 @@ if [ ! -z "${PW_VULKAN_USE}" ]; then ...@@ -178,8 +232,7 @@ if [ ! -z "${PW_VULKAN_USE}" ]; then
export var_pw_vulkan="${PW_VULKAN_USE}" export var_pw_vulkan="${PW_VULKAN_USE}"
echo "${var_pw_vulkan}" > "${PORT_WINE_TMP_PATH}/pw_vulkan" echo "${var_pw_vulkan}" > "${PORT_WINE_TMP_PATH}/pw_vulkan"
else else
read "var_pw_vulkan" < "${PORT_WINE_TMP_PATH}/pw_vulkan" read "var_pw_vulkan" < "${PORT_WINE_TMP_PATH}/pw_vulkan" && export var_pw_vulkan
export var_pw_vulkan
fi fi
PW_START_PROGRESS_BAR PW_START_PROGRESS_BAR
if [ "${var_pw_vulkan}" = "0" ]; then if [ "${var_pw_vulkan}" = "0" ]; then
...@@ -187,19 +240,17 @@ if [ "${var_pw_vulkan}" = "0" ]; then ...@@ -187,19 +240,17 @@ if [ "${var_pw_vulkan}" = "0" ]; then
export WINEDIR="${WINEDIR}_dxvk" export WINEDIR="${WINEDIR}_dxvk"
fi fi
export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}" export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}"
# export mesa_glthread=true
# export GL_THREADED_OPTIMIZATIONS=1
export GL_NO_DSO_FINALIZER=1 #Modded by Rus_Nor export GL_NO_DSO_FINALIZER=1 #Modded by Rus_Nor
export GL_YIELD="NOTHING" #Modded by Rus_Nor export GL_YIELD="NOTHING" #Modded by Rus_Nor
export GL_SHARPEN_IGNORE_FILM_GRAIN=0 #Modded by Rus_Nor export GL_SHARPEN_IGNORE_FILM_GRAIN=0 #Modded by Rus_Nor
export GL_SHARPEN_ENABLE=1 #Modded by Rus_Nor export GL_SHARPEN_ENABLE=1 #Modded by Rus_Nor
export __GL_SHARPEN_VALUE=0 #Modded by Rus_Nor export __GL_SHARPEN_VALUE=0 #Modded by Rus_Nor
for wine_build_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 ; do for wine_build_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 ; do
cp -f "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
cp -f "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" try_copy_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
done done
cp -f "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" try_copy_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/"
cp -f "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/"
export WINEESYNC="" export WINEESYNC=""
echo "Use OpenGL" echo "Use OpenGL"
elif [ "${var_pw_vulkan}" = "dxvk" ]; then elif [ "${var_pw_vulkan}" = "dxvk" ]; then
...@@ -207,12 +258,8 @@ elif [ "${var_pw_vulkan}" = "dxvk" ]; then ...@@ -207,12 +258,8 @@ elif [ "${var_pw_vulkan}" = "dxvk" ]; then
export WINEDIR="${WINEDIR}_dxvk" export WINEDIR="${WINEDIR}_dxvk"
fi fi
for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do
if [ -f "${PW_VULKAN_DLL}/dxvk/x32/${wine_dxvk_dll}.dll" ] ; then try_copy_file "${PW_VULKAN_DLL}/dxvk/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
cp -f "${PW_VULKAN_DLL}/dxvk/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" try_copy_file "${PW_VULKAN_DLL}/dxvk/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
fi
if [ -f "${PW_VULKAN_DLL}/dxvk/x64/${wine_dxvk_dll}.dll" ] ; then
cp -f "${PW_VULKAN_DLL}/dxvk/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
fi
if [ ! -z "${WINEDLLOVERRIDES}" ] ; then if [ ! -z "${WINEDLLOVERRIDES}" ] ; then
export WINEDLLOVERRIDES="${wine_dxvk_dll}=n;${WINEDLLOVERRIDES}" export WINEDLLOVERRIDES="${wine_dxvk_dll}=n;${WINEDLLOVERRIDES}"
else else
...@@ -225,29 +272,22 @@ else ...@@ -225,29 +272,22 @@ else
export WINEDIR="${WINEDIR}_vkd3d" export WINEDIR="${WINEDIR}_vkd3d"
fi fi
for wine_vkd3d_dll in d3d12 ; do for wine_vkd3d_dll in d3d12 ; do
if [ -f "${PW_VULKAN_DLL}/vkd3d-proton/x86/${wine_vkd3d_dll}.dll" ] ; then try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
cp -f "${PW_VULKAN_DLL}/vkd3d-proton/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
fi
if [ -f "${PW_VULKAN_DLL}/vkd3d-proton/x64/${wine_vkd3d_dll}.dll" ] ; then
cp -f "${PW_VULKAN_DLL}/vkd3d-proton/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
fi
if [ ! -z "${WINEDLLOVERRIDES}" ] ; then if [ ! -z "${WINEDLLOVERRIDES}" ] ; then
export WINEDLLOVERRIDES="${wine_vkd3d_dll}=n;${WINEDLLOVERRIDES}" export WINEDLLOVERRIDES="${wine_vkd3d_dll}=n;${WINEDLLOVERRIDES}"
else else
export WINEDLLOVERRIDES="${wine_vkd3d_dll}=n" export WINEDLLOVERRIDES="${wine_vkd3d_dll}=n"
fi fi
done done
cp -f "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" try_copy_file "${WINEDIR}/lib/wine/fakedlls/dxgi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
cp -f "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" try_copy_file "${WINEDIR}/lib64/wine/fakedlls/dxgi.dll" "${WINEPREFIX}/drive_c/windows/system32/"
export PW_WINDOWS_VER="10" export PW_WINDOWS_VER="10"
echo "Use VKD3D (DX12 to vulkan)" echo "Use VKD3D (DX12 to vulkan)"
fi fi
if [ -f "${PW_VULKAN_DLL}/dxvk/x32/dxvk_config.dll" ] ; then try_copy_file "${PW_VULKAN_DLL}/dxvk/x32/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
cp -f "${PW_VULKAN_DLL}/dxvk/x32/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" try_copy_file "${PW_VULKAN_DLL}/dxvk/x64/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/system32/"
fi
if [ -f "${PW_VULKAN_DLL}/dxvk/x64/dxvk_config.dll" ] ; then
cp -f "${PW_VULKAN_DLL}/dxvk/x64/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/system32/"
fi
export WINELOADER="${WINEDIR}/bin/wine" export WINELOADER="${WINEDIR}/bin/wine"
export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine"
export WINESERVER="${WINEDIR}/bin/wineserver" export WINESERVER="${WINEDIR}/bin/wineserver"
...@@ -264,14 +304,15 @@ rm -f "${WINEDIR}"*/lib*/wine/fakedlls/*steam* ...@@ -264,14 +304,15 @@ rm -f "${WINEDIR}"*/lib*/wine/fakedlls/*steam*
rm -f "${WINEPREFIX}/drive_c/windows/system32"/steam* rm -f "${WINEPREFIX}/drive_c/windows/system32"/steam*
rm -f "${WINEPREFIX}/drive_c/windows/syswow64"/steam* rm -f "${WINEPREFIX}/drive_c/windows/syswow64"/steam*
cp -f "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arial.ttf try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arial.ttf
cp -f "${WINEDIR}/share/fonts/"LiberationSans-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arialbd.ttf try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arialbd.ttf
cp -f "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"times.ttf try_copy_file "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"times.ttf
cp -f "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"cour.ttf try_copy_file "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"cour.ttf
cp -f "${WINEDIR}/share/fonts/"SourceHanSansSCRegular.otf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf try_copy_file "${WINEDIR}/share/fonts/"SourceHanSansSCRegular.otf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf
for wine_build_dll in ntdll mf mf3216 mferror mfmediaengine mfplat mfplay mfreadwrite vulkan-1 ; do for wine_build_dll in ntdll mf mf3216 mferror mfmediaengine mfplat mfplay mfreadwrite vulkan-1 ; do
cp -f "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
cp -f "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" try_copy_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
done done
export WINEDLLOVERRIDES="mf,mf3216,mferror,mfmediaengine,mfplat,mfplay,mfreadwrite=b;steam_api,steam_api64,steamclient,steamclient64=n;${WINEDLLOVERRIDES}" export WINEDLLOVERRIDES="mf,mf3216,mferror,mfmediaengine,mfplat,mfplay,mfreadwrite=b;steam_api,steam_api64,steamclient,steamclient64=n;${WINEDLLOVERRIDES}"
export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/gstreamer-1.0" export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/gstreamer-1.0"
...@@ -390,38 +431,33 @@ if [ ! -z ${PW_XKBD} ]; then ...@@ -390,38 +431,33 @@ if [ ! -z ${PW_XKBD} ]; then
setxkbmap us,ru setxkbmap us,ru
fi fi
if [ -x "`which "gamemoderun" 2>/dev/null`" ] && [ "$PW_FORCE_DISABLED_GAMEMOD" -eq "0" ]; then if [ -x "`which "gamemoderun" 2>/dev/null`" ] && [ "$PW_FORCE_DISABLED_GAMEMOD" -eq "0" ]; then
# systemctl --user enable gamemoded.service
# systemctl --user restart gamemoded.service
export PW_GAMEMODERUN=1 export PW_GAMEMODERUN=1
echo "Gamemod will be launched." echo "Gamemod will be launched."
else else
export PW_GAMEMODERUN=0 export PW_GAMEMODERUN=0
echo "Gamemod is not installed or disabled in vars script: PW_FORCE_DISABLED_GAMEMOD=$PW_FORCE_DISABLED_GAMEMOD" echo "Gamemod is not installed or disabled in vars script: PW_FORCE_DISABLED_GAMEMOD=$PW_FORCE_DISABLED_GAMEMOD"
fi fi
echo "######################################################"
PW_CREATE_PFX PW_CREATE_PFX
RUN_WINETRICKS_FROM_DB RUN_WINETRICKS_FROM_DB
ADD_IN_START_PORTWINE ADD_IN_START_PORTWINE
} }
########################################################################
WAIT_WINESERVER () WAIT_WINESERVER () {
{
sleep 3 sleep 3
while [ ! -z "$(ls -l /proc/*/exe 2>/dev/null | grep -ie ${portname} | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}')" ] ; do while [ ! -z "$(ls -l /proc/*/exe 2>/dev/null | grep -ie ${portname} | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}')" ] ; do
sleep 1 sleep 1
done done
} }
########################################################################
KILL_PORTWINE () KILL_PORTWINE () {
{
wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -ie ${portname} | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}') #modded by Cefeiko wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -ie ${portname} | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}') #modded by Cefeiko
if [ ! -z "${wine_pids}" ] ; then if [ ! -z "${wine_pids}" ] ; then
"${WINESERVER}" -k
kill -9 ${wine_pids} kill -9 ${wine_pids}
fi fi
} }
########################################################################
STOP_PORTWINE () STOP_PORTWINE () {
{
WAIT_WINESERVER WAIT_WINESERVER
ADD_IN_STOP_PORTWINE ADD_IN_STOP_PORTWINE
if [ "$int_xneur" = "1" ]; then if [ "$int_xneur" = "1" ]; then
...@@ -430,39 +466,29 @@ fi ...@@ -430,39 +466,29 @@ fi
if [ ! -z ${PW_XKBD} ]; then if [ ! -z ${PW_XKBD} ]; then
setxkbmap ${PW_XKBD} setxkbmap ${PW_XKBD}
fi fi
rm -f "${PORT_WINE_PATH}"/1
rm -f "${PORT_SCRIPTS_PATH}"/1
rm -f "${PORT_WINE_PATH}"/0
rm -f "${PORT_SCRIPTS_PATH}"/0
PW_STOP_PROGRESS_BAR PW_STOP_PROGRESS_BAR
} }
########################################################################
UPDATE_WINETRICKS () UPDATE_WINETRICKS () {
{
W_TRX_URL="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" W_TRX_URL="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks"
W_TRX_EXT_VER="$(curl -s --list-only ${W_TRX_URL} | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" W_TRX_EXT_VER="$(curl --connect-timeout 2 -s --list-only ${W_TRX_URL} | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
if ! [[ -f "${PORT_WINE_TMP_PATH}/winetricks" ]] if [ ! -f "${PORT_WINE_TMP_PATH}/winetricks" ] ; then
then try_download "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks"
wget -T 3 --output-document=${PORT_WINE_TMP_PATH}/winetricks ${W_TRX_URL}
chmod u+x "${PORT_WINE_TMP_PATH}/winetricks" chmod u+x "${PORT_WINE_TMP_PATH}/winetricks"
else else
W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
if [[ $W_TRX_INT_VER != $W_TRX_EXT_VER ]] if [ $W_TRX_INT_VER != $W_TRX_EXT_VER ] ; then
then rm -f "${PORT_WINE_TMP_PATH}/winetricks"
rm -f "${PORT_WINE_TMP_PATH}/winetricks" try_download "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks"
wget -T 3 --output-document=${PORT_WINE_TMP_PATH}/winetricks ${W_TRX_URL} chmod u+x "${PORT_WINE_TMP_PATH}/winetricks"
chmod u+x "${PORT_WINE_TMP_PATH}/winetricks" fi
fi
fi #modded by Cefeiko fi #modded by Cefeiko
sed -i '/w_try winetricks_early_wine cmd/d' "${PORT_WINE_TMP_PATH}/winetricks" sed -i '/w_try winetricks_early_wine cmd/d' "${PORT_WINE_TMP_PATH}/winetricks"
try_remove_dir "${HOME}/.cache/winetricks/"
} }
########################################################################
RUN_WINETRICKS_FROM_DB () RUN_WINETRICKS_FROM_DB () {
{
UPDATE_WINETRICKS UPDATE_WINETRICKS
if [ -d "${HOME}/.cache/winetricks/" ] ; then
rm -fr "${HOME}/.cache/winetricks/"
fi
if [ ! -z "${PW_DLL_INSTALL}" ]; then if [ ! -z "${PW_DLL_INSTALL}" ]; then
PW_STOP_PROGRESS_BAR PW_STOP_PROGRESS_BAR
export USE_WT_FROM_DB=0 export USE_WT_FROM_DB=0
...@@ -493,9 +519,8 @@ if [[ -z `cat "${WINEPREFIX}/system.reg" | grep "Windows $PW_WINDOWS_VER"` ]] ; ...@@ -493,9 +519,8 @@ if [[ -z `cat "${WINEPREFIX}/system.reg" | grep "Windows $PW_WINDOWS_VER"` ]] ;
echo "Set to win${PW_WINDOWS_VER}" echo "Set to win${PW_WINDOWS_VER}"
fi fi
} }
########################################################################
PW_UPDATE () PW_UPDATE () {
{
if [ ! -f "${PORT_WINE_TMP_PATH}/${portname}_ver" ] ; then if [ ! -f "${PORT_WINE_TMP_PATH}/${portname}_ver" ] ; then
echo "10" > "${PORT_WINE_TMP_PATH}/${portname}_ver" echo "10" > "${PORT_WINE_TMP_PATH}/${portname}_ver"
fi fi
...@@ -504,14 +529,12 @@ if [ ! -f "${PORT_WINE_TMP_PATH}/update_notifier" ] ; then ...@@ -504,14 +529,12 @@ if [ ! -f "${PORT_WINE_TMP_PATH}/update_notifier" ] ; then
fi fi
read "update_not" < "${PORT_WINE_TMP_PATH}/update_notifier" read "update_not" < "${PORT_WINE_TMP_PATH}/update_notifier"
if [ "${update_not}" = "1" ] ; then if [ "${update_not}" = "1" ] ; then
wget -T 2 --output-document="${PORT_WINE_TMP_PATH}/${portname}_cur_ver" "${PW_FTP_URL}/current_version/${portname}_ver" && try_download "${PW_FTP_URL}/current_version/${portname}_ver" "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" &&
if [ -f "${PORT_WINE_TMP_PATH}/${portname}_ver" ] if [ -f "${PORT_WINE_TMP_PATH}/${portname}_ver" ] ; then
then
read current_ver < "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" read current_ver < "${PORT_WINE_TMP_PATH}/${portname}_cur_ver"
read install_ver < "${PORT_WINE_TMP_PATH}/${portname}_ver" read install_ver < "${PORT_WINE_TMP_PATH}/${portname}_ver"
rm -f "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" try_remove_file "${PORT_WINE_TMP_PATH}/${portname}_cur_ver"
if [ "${current_ver}" -gt "${install_ver}" ] if [ "${current_ver}" -gt "${install_ver}" ] ; then
then
xsd=`zenity --title "${port_upd1}" --text "${port_upd2}" --list --radiolist --height=220 --column="${inst_set}" --column "${port_upd3}" \ xsd=`zenity --title "${port_upd1}" --text "${port_upd2}" --list --radiolist --height=220 --column="${inst_set}" --column "${port_upd3}" \
TRUE "${port_upd4}" \ TRUE "${port_upd4}" \
FALSE "${port_upd5}" \ FALSE "${port_upd5}" \
...@@ -529,16 +552,11 @@ if [ "${update_not}" = "1" ] ; then ...@@ -529,16 +552,11 @@ if [ "${update_not}" = "1" ] ; then
fi fi
fi fi
fi fi
######################################################################## if [ ! -f "${HOME}/.config/.PortTime" ] ; then
if [ ! -f "${HOME}/.config/.PortTime" ]
then
echo "10" > "${HOME}/.config/.PortTime" echo "10" > "${HOME}/.config/.PortTime"
fi fi
read "port_time" < "${HOME}/.config/.PortTime" read "port_time" < "${HOME}/.config/.PortTime"
if [ "${port_time}" -gt "1" ] ; then
if [ "${port_time}" -gt "1" ]
then
port_time=$((${port_time}-1)) port_time=$((${port_time}-1))
echo "${port_time}" > "${HOME}/.config/.PortTime" echo "${port_time}" > "${HOME}/.config/.PortTime"
else else
...@@ -549,31 +567,30 @@ else ...@@ -549,31 +567,30 @@ else
if [ $? = 1 ] ; then if [ $? = 1 ] ; then
echo "1" > "${HOME}/.config/.PortTime" echo "1" > "${HOME}/.config/.PortTime"
else else
case $xsd2 in case $xsd2 in
"${port_time4}") "${port_time4}")
if [ ! -z "$(command -v sensible-browser)" ]; then if [ ! -z "$(command -v sensible-browser)" ]; then
sensible-browser "$urlg" & sensible-browser "$urlg" &
elif [ ! -z "$(command -v xdg-open)" ]; then elif [ ! -z "$(command -v xdg-open)" ]; then
xdg-open "$urlg" & xdg-open "$urlg" &
elif [ ! -z "$(command -v gnome-open)" ]; then elif [ ! -z "$(command -v gnome-open)" ]; then
gnome-open "$urlg" & gnome-open "$urlg" &
elif [ ! -z "$(command -v python)" ]; then elif [ ! -z "$(command -v python)" ]; then
python -m webbrowser "$urlg" python -m webbrowser "$urlg"
fi & fi &
echo "300" > "${HOME}/.config/.PortTime" echo "300" > "${HOME}/.config/.PortTime"
sleep 5 sleep 5
exit 0 ;; exit 0 ;;
"${port_time5}") "${port_time5}")
echo "75" > "${HOME}/.config/.PortTime" ;; echo "75" > "${HOME}/.config/.PortTime" ;;
"${port_time6}") "${port_time6}")
echo "150" > "${HOME}/.config/.PortTime" ;; echo "150" > "${HOME}/.config/.PortTime" ;;
esac esac
fi fi
fi fi
} }
########################################################################
PW_CREATE_PFX () PW_CREATE_PFX () {
{
#sed -i '/HKCU,Software\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf #sed -i '/HKCU,Software\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf
#sed -i '/HKLM,Software\\Wow6432Node\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf #sed -i '/HKLM,Software\\Wow6432Node\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf
#sed -i '/HKLM,Software\\Wow6432Node\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf #sed -i '/HKLM,Software\\Wow6432Node\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf
...@@ -589,26 +606,23 @@ fi ...@@ -589,26 +606,23 @@ fi
#sed -i '/steamclient/d' "${WINEPREFIX}"/*.reg #sed -i '/steamclient/d' "${WINEPREFIX}"/*.reg
#sed -i '/SteamPath/d' "${WINEPREFIX}"/*.reg #sed -i '/SteamPath/d' "${WINEPREFIX}"/*.reg
} }
########################################################################
PW_SCRIPTS_UPDATE () PW_SCRIPTS_UPDATE () {
{
if [ ! -f "${PORT_WINE_TMP_PATH}/scripts_ver" ] ; then if [ ! -f "${PORT_WINE_TMP_PATH}/scripts_ver" ] ; then
echo "1000" > "${PORT_WINE_TMP_PATH}/scripts_ver" echo "1000" > "${PORT_WINE_TMP_PATH}/scripts_ver"
fi fi
wget -T 2 --output-document="${PORT_WINE_TMP_PATH}/scripts_cur_ver" "${PW_FTP_URL}/current_version/scripts_ver" try_download "${PW_FTP_URL}/current_version/scripts_ver" "${PORT_WINE_TMP_PATH}/scripts_cur_ver"
if [ "$?" == "0" ] ; then if [ "$?" == "0" ] ; then
read scripts_current_ver < "${PORT_WINE_TMP_PATH}/scripts_cur_ver" read scripts_current_ver < "${PORT_WINE_TMP_PATH}/scripts_cur_ver"
read scripts_install_ver < "${PORT_WINE_TMP_PATH}/scripts_ver" read scripts_install_ver < "${PORT_WINE_TMP_PATH}/scripts_ver"
if [ -f "${PORT_WINE_TMP_PATH}/scripts_cur_ver" ] ; then try_remove_file "${PORT_WINE_TMP_PATH}/scripts_cur_ver"
rm -f "${PORT_WINE_TMP_PATH}/scripts_cur_ver"
fi
if [ "${scripts_current_ver}" -gt "${scripts_install_ver}" ] ; then if [ "${scripts_current_ver}" -gt "${scripts_install_ver}" ] ; then
echo "######################################################" echo "######################################################"
echo "Update scripts..." echo "Update scripts..."
wget -c -T 2 --output-document="${PORT_WINE_TMP_PATH}/scripts.tar.xz" "${PW_FTP_URL}/dist/scripts.tar.xz" try_download "${PW_FTP_URL}/dist/scripts.tar.xz" "${PORT_WINE_TMP_PATH}/scripts.tar.xz"
tar -Jxvf "${PORT_WINE_TMP_PATH}/scripts.tar.xz" -C "${PORT_WINE_PATH}/data/" tar -Jxvf "${PORT_WINE_TMP_PATH}/scripts.tar.xz" -C "${PORT_WINE_PATH}/data/"
if [ "$?" == "0" ] ; then if [ "$?" == "0" ] ; then
rm -f "${PORT_WINE_TMP_PATH}/scripts.tar.xz" try_remove_file "${PORT_WINE_TMP_PATH}/scripts.tar.xz"
echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver" echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver"
`zenity --info --title "Info..." --text " Updating scripts and database of games\n and programs completed successfully.\n\n Restart ${portname}." --no-wrap ` > /dev/null 2>&1 `zenity --info --title "Info..." --text " Updating scripts and database of games\n and programs completed successfully.\n\n Restart ${portname}." --no-wrap ` > /dev/null 2>&1
exit 0 exit 0
...@@ -616,9 +630,8 @@ if [ "$?" == "0" ] ; then ...@@ -616,9 +630,8 @@ if [ "$?" == "0" ] ; then
fi fi
fi fi
} }
########################################################################
PW_RUN () PW_RUN () {
{
if [ ! -z "$portwine_exe" ] ; then if [ ! -z "$portwine_exe" ] ; then
export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )"
cd "$PATH_TO_GAME" cd "$PATH_TO_GAME"
......
...@@ -2,38 +2,22 @@ ...@@ -2,38 +2,22 @@
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
rm -f "${PORT_WINE_PATH}/"*".log" try_remove_file "${PORT_WINE_TMP_PATH}/update_notifier"
rm -f "${PORT_WINE_TMP_PATH}/update_notifier" try_remove_file "${PORT_WINE_TMP_PATH}/init_run_suc"
rm -f "${PORT_WINE_TMP_PATH}/init_run_suc"
rm -fr "${PORT_WINE_PATH}/data/pfx/dosdevices"
rm -fr "${PORT_WINE_PATH}/data/port_on"
rm -fr "${PORT_WINE_PATH}/data/dxvk.conf"
rm -f "${PORT_WINE_PATH}/Create_shortcut_PP.desktop"
rm -f "${PORT_WINE_PATH}/Proton.desktop"
rm -f "${PORT_WINE_PATH}/settings.desktop"
rm -f "${PORT_WINE_PATH}/settings.desktop"
rm -f "${PORT_WINE_PATH}/debug.desktop"
if [ -d "${PORT_WINE_PATH}/Settings" ]; then try_remove_file "${PORT_WINE_PATH}/data/port_on"
rm -fr "${PORT_WINE_PATH}/Settings" try_remove_file "${PORT_WINE_PATH}/data/dxvk.conf"
fi try_remove_file "${PORT_WINE_PATH}/Create_shortcut_PP.desktop"
if [ ! -z "${PATH_TO_GAME}" ]; then try_remove_file "${PORT_WINE_PATH}/Proton.desktop"
rm -f "${PATH_TO_GAME}"/*.dxvk-cache try_remove_file "${PORT_WINE_PATH}/settings.desktop"
fi try_remove_file "${PORT_WINE_PATH}/settings.desktop"
if [ -f "${PORT_WINE_PATH}/restart.desktop" ]; then try_remove_file "${PORT_WINE_PATH}/debug.desktop"
rm "${PORT_WINE_PATH}/restart.desktop" try_remove_file "${PORT_WINE_PATH}/restart.desktop"
fi
if [ ! -d "/home/${USER}/.local/share/applications" ] try_remove_dir "${PORT_WINE_PATH}/data/pfx/dosdevices"
then try_remove_dir "${PORT_WINE_PATH}/Settings"
mkdir -p "/home/${USER}/.local/share/applications"
else create_new_dir "/home/${USER}/.local/share/applications"
if [ -e "/home/${USER}/.local/share/applications/Create_shortcut_PP.desktop" ]; then
rm -f "/home/${USER}/.local/share/applications/Create_shortcut_PP.desktop"
fi
if [ -e "/home/${USER}/.local/share/applications/Proton.desktop" ]; then
rm -f "/home/${USER}/.local/share/applications/Proton.desktop"
fi
fi
if ! [ "${portname}" = "PortProton" ]; then if ! [ "${portname}" = "PortProton" ]; then
name_desktop="${gamename}" name_desktop="${gamename}"
...@@ -84,9 +68,8 @@ do ...@@ -84,9 +68,8 @@ do
chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop" chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
done done
chmod u+x "${PORT_SCRIPTS_PATH}/"* chmod u+x "${PORT_SCRIPTS_PATH}/"*
if [ ! -d "${PORT_WINE_PATH}/drive_c" ]; then
ln -s "${PORT_WINE_PATH}/data/pfx/drive_c/" "${PORT_WINE_PATH}/drive_c" try_force_link_dir "${PORT_WINE_PATH}/data/pfx/drive_c/" "${PORT_WINE_PATH}/drive_c"
fi
if [ -d "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public" ] && [ ! -L "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public" ]; then if [ -d "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public" ] && [ ! -L "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public" ]; then
cp -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public"/* "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser/" cp -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public"/* "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser/"
rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public" rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public"
...@@ -94,13 +77,16 @@ elif [ -L "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public" ]; then ...@@ -94,13 +77,16 @@ elif [ -L "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public" ]; then
rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public" rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public"
fi fi
ln -s "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser" "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public" ln -s "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser" "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public"
if [ ! -d "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}" ]; then if [ ! -d "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}" ]; then
ln -s "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser" "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}" ln -s "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser" "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}"
fi fi
if [ -e "${PORT_WINE_PATH}/data/pfx/system.reg" ] || [ -e "${PORT_WINE_PATH}/data/pfx/user.reg" ] || [ -e "${PORT_WINE_PATH}/data/pfx/userdef.reg" ]; then if [ -e "${PORT_WINE_PATH}/data/pfx/system.reg" ] || [ -e "${PORT_WINE_PATH}/data/pfx/user.reg" ] || [ -e "${PORT_WINE_PATH}/data/pfx/userdef.reg" ]; then
sed -i "s/xuser/${USER}/g" "${PORT_WINE_PATH}/data/pfx/"*.reg sed -i "s/xuser/${USER}/g" "${PORT_WINE_PATH}/data/pfx/"*.reg
sed -i "s/vagrant/${USER}/g" "${PORT_WINE_PATH}/data/pfx/"*.reg sed -i "s/vagrant/${USER}/g" "${PORT_WINE_PATH}/data/pfx/"*.reg
fi fi
if [ "${s_install}" = "1" ]; then if [ "${s_install}" = "1" ]; then
echo "Installation completed successfully." echo "Installation completed successfully."
else else
......
...@@ -47,7 +47,7 @@ if [ -x "`which wrestool 2>/dev/null`" ]; then ...@@ -47,7 +47,7 @@ if [ -x "`which wrestool 2>/dev/null`" ]; then
cp -f "${PORTPROTON_EXE}.ico" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.ico" cp -f "${PORTPROTON_EXE}.ico" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.ico"
rm -f "${PORTPROTON_PATH}/"*.ico rm -f "${PORTPROTON_PATH}/"*.ico
fi fi
if [ $? -eq 1 ];then exit 1; fi if [ $? -eq 1 ] ; then exit 1 ; fi
export PW_VULKAN_TO_DB=`cat "${PORT_WINE_TMP_PATH}/pw_vulkan"` export PW_VULKAN_TO_DB=`cat "${PORT_WINE_TMP_PATH}/pw_vulkan"`
if [ ! -z "${PORTWINE_DB}" ]; then if [ ! -z "${PORTWINE_DB}" ]; then
PORTWINE_DB_FILE=`grep -il "${PORTWINE_DB}" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi` PORTWINE_DB_FILE=`grep -il "${PORTWINE_DB}" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi`
...@@ -147,9 +147,7 @@ echo "log WINE:" >> "${PORT_WINE_PATH}/${portname}.log" ...@@ -147,9 +147,7 @@ echo "log WINE:" >> "${PORT_WINE_PATH}/${portname}.log"
export DXVK_HUD="full" export DXVK_HUD="full"
export PW_XTERM="${WINELIB}/amd64/usr/bin/xterm -l -lf ${PORT_WINE_PATH}/${portname}.log.wine -geometry 159x37 -e" export PW_XTERM="${WINELIB}/amd64/usr/bin/xterm -l -lf ${PORT_WINE_PATH}/${portname}.log.wine -geometry 159x37 -e"
if [ -f "${PORT_WINE_PATH}/${portname}.log.wine" ]; then try_remove_file "${PORT_WINE_PATH}/${portname}.log.wine"
rm -f "${PORT_WINE_PATH}/${portname}.log.wine"
fi
if [ ! -z "${portwine_exe}" ]; then if [ ! -z "${portwine_exe}" ]; then
export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )"
cd "$PATH_TO_GAME" cd "$PATH_TO_GAME"
...@@ -168,21 +166,19 @@ else ...@@ -168,21 +166,19 @@ else
export PATH_TO_GAME="$( cd "$( dirname "${gamestart}" )" >/dev/null 2>&1 && pwd )" export PATH_TO_GAME="$( cd "$( dirname "${gamestart}" )" >/dev/null 2>&1 && pwd )"
cd "$PATH_TO_GAME" cd "$PATH_TO_GAME"
if [ ! -z $optirun_on ]; then if [ ! -z $optirun_on ]; then
$PW_XTERM "${WINELOADER}" ${optirun_on} "${gamestart}" ${LAUNCH_PARAMETERS} 2>&1 & ${optirun_on} $PW_XTERM "${PW_RUNTIME}" "${WINELOADER}" "${gamestart}" ${LAUNCH_PARAMETERS} 2>&1 &
else else
$PW_XTERM "${WINELOADER}" "${gamestart}" ${LAUNCH_PARAMETERS} 2>&1 & $PW_XTERM "${PW_RUNTIME}" "${WINELOADER}" "${gamestart}" ${LAUNCH_PARAMETERS} 2>&1 &
fi fi
fi fi
zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap && "${WINESERVER}" -k zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap && "${WINESERVER}" -k
STOP_PORTWINE | sszen STOP_PORTWINE | sszen
cat "${PORT_WINE_PATH}/${portname}.log.wine" >> "${PORT_WINE_PATH}/${portname}.log" cat "${PORT_WINE_PATH}/${portname}.log.wine" >> "${PORT_WINE_PATH}/${portname}.log"
rm -f "${PORT_WINE_PATH}/${portname}.log.wine" try_remove_file "${PORT_WINE_PATH}/${portname}.log.wine"
deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log" | awk '! a[$0]++') deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log" | awk '! a[$0]++')
echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log" echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log"
echo "$deb_text" | zenity --text-info --editable \ echo "$deb_text" | zenity --text-info --editable --width=800 --height=600 --title="${portname}.log"
--width=800 --height=600 \
--title="${portname}.log"
} }
######################################################################## ########################################################################
PW_WINECFG () PW_WINECFG ()
...@@ -215,7 +211,7 @@ PW_WINETRICKS () ...@@ -215,7 +211,7 @@ PW_WINETRICKS ()
UPDATE_WINETRICKS UPDATE_WINETRICKS
export PW_USE_TERMINAL=1 export PW_USE_TERMINAL=1
START_PORTWINE START_PORTWINE
$PW_TERM "${PORT_WINE_TMP_PATH}/winetricks" -q --force $PW_TERM "${PW_RUNTIME}" "${PORT_WINE_TMP_PATH}/winetricks" -q --force
} }
######################################################################## ########################################################################
if [ ! -z "${portwine_exe}" ]; then if [ ! -z "${portwine_exe}" ]; then
......
...@@ -19,12 +19,12 @@ export PROGS_INST="" ...@@ -19,12 +19,12 @@ export PROGS_INST=""
export vexit=0 export vexit=0
for PROGS in "wget" "curl" "tar" for PROGS in "wget" "curl" "tar"
do do
if [ ! -x "`which "${PROGS}" 2>/dev/null`" ];then if [ ! -x "`which "${PROGS}" 2>/dev/null`" ] ; then
PROGS_INST="${PROGS_INST} ${PROGS}" PROGS_INST="${PROGS_INST} ${PROGS}"
vexit=1 vexit=1
fi fi
done done
if [ "${vexit}" -eq "1" ];then if [ "${vexit}" -eq "1" ] ; then
echo "You will need to install: ${PROGS_INST}, and restart the script" echo "You will need to install: ${PROGS_INST}, and restart the script"
exit 1 exit 1
fi fi
...@@ -36,10 +36,10 @@ ARCH_NAME="${setup_script}.tar.xz" ...@@ -36,10 +36,10 @@ ARCH_NAME="${setup_script}.tar.xz"
deflink="/home/${USER}/PortWINE/${portname}" deflink="/home/${USER}/PortWINE/${portname}"
[ $(id -u) -eq 0 ] && echo "Do not run the script from the superuser!" && zenity --error --text "Do not run the script from the superuser!" 2> /dev/null && exit 1 [ $(id -u) -eq 0 ] && echo "Do not run the script from the superuser!" && zenity --error --text "Do not run the script from the superuser!" 2> /dev/null && exit 1
######################################################################## ########################################################################
if [ "$1" = "-rus" ]; then if [ "$1" = "-rus" ] ; then
SET_LANG="Russian" SET_LANG="Russian"
export s_install="1" export s_install="1"
elif [ "$1" = "-eng" ]; then elif [ "$1" = "-eng" ] ; then
SET_LANG="English" SET_LANG="English"
export s_install="1" export s_install="1"
else else
...@@ -47,7 +47,7 @@ else ...@@ -47,7 +47,7 @@ else
--column="Set:" --column "Language:" \ --column="Set:" --column "Language:" \
TRUE "Russian" \ TRUE "Russian" \
FALSE "English" ` 2> /dev/null FALSE "English" ` 2> /dev/null
if [ $? -eq 1 ];then exit 1; fi if [ $? -eq 1 ] ; then exit 1 ; fi
case $SET_LANG in case $SET_LANG in
"Russian") "Russian")
INFO_TEXT="Вы запустили установщик PortWINE ${gamename} версии ${port_ver}. \n\nЭто не коммерческий продукт и развивается исключительно за идею и Ваши пожертвования. \nВсе права сторонего програмного обеспечения принадлежат их владельцам! \nПродолжая установку вы автоматически соглашаетесь с данными условиями." > /dev/null 2>&1 ;; INFO_TEXT="Вы запустили установщик PortWINE ${gamename} версии ${port_ver}. \n\nЭто не коммерческий продукт и развивается исключительно за идею и Ваши пожертвования. \nВсе права сторонего програмного обеспечения принадлежат их владельцам! \nПродолжая установку вы автоматически соглашаетесь с данными условиями." > /dev/null 2>&1 ;;
...@@ -55,10 +55,10 @@ else ...@@ -55,10 +55,10 @@ else
INFO_TEXT="You run the installer PortWINE ${gamename} v. ${port_ver}. \n\nThis is not a commercial product and developed exclusively for the idea and donate. \nAll rights to third-party software belong to their respective owners! \nContinuing the installation of you agree to these terms." > /dev/null 2>&1 ;; INFO_TEXT="You run the installer PortWINE ${gamename} v. ${port_ver}. \n\nThis is not a commercial product and developed exclusively for the idea and donate. \nAll rights to third-party software belong to their respective owners! \nContinuing the installation of you agree to these terms." > /dev/null 2>&1 ;;
esac esac
`zenity --info --title "INFO" --text "$INFO_TEXT" --no-wrap ` 2> /dev/null `zenity --info --title "INFO" --text "$INFO_TEXT" --no-wrap ` 2> /dev/null
if [ $? -eq 1 ];then echo "error" && exit 1; fi if [ $? -eq 1 ] ; then echo "error" && exit 1 ; fi
fi fi
######################################################################## ########################################################################
if [ "${s_install}" = "1" ]; then if [ "${s_install}" = "1" ] ; then
echo "${portname} is installed in ${deflink}" echo "${portname} is installed in ${deflink}"
D_PATH="${deflink}" D_PATH="${deflink}"
else else
...@@ -68,7 +68,7 @@ else ...@@ -68,7 +68,7 @@ else
--column="Выбор" --column "Путь:" \ --column="Выбор" --column "Путь:" \
TRUE "${deflink}" \ TRUE "${deflink}" \
FALSE "Другой путь..." ` 2> /dev/null FALSE "Другой путь..." ` 2> /dev/null
if [ $? -eq 1 ];then exit 1; fi if [ $? -eq 1 ] ; then exit 1 ; fi
case $inst1 in case $inst1 in
"${deflink}") "${deflink}")
D_PATH="${deflink}" ;; D_PATH="${deflink}" ;;
...@@ -90,10 +90,10 @@ else ...@@ -90,10 +90,10 @@ else
D_PATH="${D_PATH}/${portname}" ;; D_PATH="${D_PATH}/${portname}" ;;
esac ;; esac ;;
esac esac
if [ $? -eq 1 ];then echo "error" && exit 1; fi if [ $? -eq 1 ] ; then echo "error" && exit 1 ; fi
fi fi
######################################################################## ########################################################################
if [ "${s_install}" != "1" ]; then if [ "${s_install}" != "1" ] ; then
case $SET_LANG in case $SET_LANG in
"Russian") "Russian")
zen() { zen() {
...@@ -104,16 +104,16 @@ if [ "${s_install}" != "1" ]; then ...@@ -104,16 +104,16 @@ if [ "${s_install}" != "1" ]; then
zenity --progress --title="Install..." --text="Install ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1 zenity --progress --title="Install..." --text="Install ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1
} ;; } ;;
esac esac
if [ $? -eq 1 ];then echo "error" && exit 1; fi if [ $? -eq 1 ] ; then echo "error" && exit 1 ; fi
fi fi
######################################################################## ########################################################################
export PORT_WINE_PATH="${D_PATH}" export PORT_WINE_PATH="${D_PATH}"
if [ ! -d "${PORT_WINE_PATH}" ];then if [ ! -d "${PORT_WINE_PATH}" ] ; then
mkdir -p "$PORT_WINE_PATH" mkdir -p "$PORT_WINE_PATH"
else else
for CLEAN_PORT in "dist" "dist_dxvk" "dist_vkd3d" "libs" "tmp" for CLEAN_PORT in "dist" "dist_dxvk" "dist_vkd3d" "libs" "tmp"
do do
if [ -d "${PORT_WINE_PATH}/data/${CLEAN_PORT}" ];then if [ -d "${PORT_WINE_PATH}/data/${CLEAN_PORT}" ] ; then
rm -fR "${PORT_WINE_PATH}/data/${CLEAN_PORT}" rm -fR "${PORT_WINE_PATH}/data/${CLEAN_PORT}"
fi fi
done done
...@@ -134,14 +134,14 @@ case $SET_LANG in ...@@ -134,14 +134,14 @@ case $SET_LANG in
"English") "English")
echo "ENG" > "${PORT_WINE_PATH}/data/tmp/${portname}_loc" ;; echo "ENG" > "${PORT_WINE_PATH}/data/tmp/${portname}_loc" ;;
esac esac
if [ $? -eq 1 ];then echo "error" && exit 1; fi if [ $? -eq 1 ] ; then echo "error" && exit 1 ; fi
export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp" export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
read "update_loc" < "${PORT_WINE_TMP_PATH}/${portname}_loc" read "update_loc" < "${PORT_WINE_TMP_PATH}/${portname}_loc"
export update_loc=${update_loc} export update_loc=${update_loc}
######################################################################## ########################################################################
cd "${PORT_WINE_PATH}" cd "${PORT_WINE_PATH}"
tail -n +162 "${links}/${setup_script}" > "${PORT_WINE_PATH}/${ARCH_NAME}" tail -n +162 "${links}/${setup_script}" > "${PORT_WINE_PATH}/${ARCH_NAME}"
if [ "${s_install}" = "1" ]; then if [ "${s_install}" = "1" ] ; then
tar -Jxvf "${PORT_WINE_PATH}/${ARCH_NAME}" -C "${PORT_WINE_PATH}/" tar -Jxvf "${PORT_WINE_PATH}/${ARCH_NAME}" -C "${PORT_WINE_PATH}/"
else else
tar -Jxvf "${PORT_WINE_PATH}/${ARCH_NAME}" -C "${PORT_WINE_PATH}/" | zen tar -Jxvf "${PORT_WINE_PATH}/${ARCH_NAME}" -C "${PORT_WINE_PATH}/" | zen
...@@ -150,7 +150,7 @@ chmod 755 -R "${PORT_WINE_PATH}" ...@@ -150,7 +150,7 @@ chmod 755 -R "${PORT_WINE_PATH}"
mv -f "${PORT_WINE_PATH}/${ARCH_NAME}" "${PORT_WINE_PATH}/data/tmp" mv -f "${PORT_WINE_PATH}/${ARCH_NAME}" "${PORT_WINE_PATH}/data/tmp"
sed -n 1,161p "${links}/${setup_script}" > "${PORT_WINE_PATH}/data/tmp/${setup_script}" sed -n 1,161p "${links}/${setup_script}" > "${PORT_WINE_PATH}/data/tmp/${setup_script}"
######################################################################## ########################################################################
if [ -d "${PORT_PFX}_old" ];then if [ -d "${PORT_PFX}_old" ] ; then
rm -fR "${PORT_PFX}" rm -fR "${PORT_PFX}"
mv -f "${PORT_PFX}_old" "${PORT_PFX}" mv -f "${PORT_PFX}_old" "${PORT_PFX}"
fi fi
......
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