From 1be7737322541936193cf5a3f230e82ea5e13e14 Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Thu, 24 Feb 2022 18:36:59 +0300
Subject: [PATCH] Scripts version 2090.1

---
 data_from_portwine/changelog_eng            | 3 +++
 data_from_portwine/changelog_rus            | 3 +++
 data_from_portwine/scripts/functions_helper | 8 ++++----
 data_from_portwine/scripts/runlib           | 5 -----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index db79535..34d0c77 100644
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://boosty
 -----------------------------------------
 Changelog:
 
+###Scripts version 2086 - 2090###
+* HOTFIX - fixed creation of symbolic links
+
 ###Scripts version 2086 - 2089###
 * updated "PROTON_STEAM" to version 7.0-1
 * updated "libs_v22.2" (Steam Runtime Sniper container update)
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index 2b467ef..2513fc2 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,9 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2090###
+* HOTFIX - исправлено создание символьных ссылок
+
 ###Scripts version 2086 - 2089###
 * обновлен "PROTON_STEAM" до версии 7.0-1
 * обновлен "libs_v22.2" (обновление контейнера Steam Runtime Sniper)
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 293e0b7..e7a117f 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -63,8 +63,8 @@ try_remove_dir () {
 export -f try_remove_dir
 
 try_force_link_file () {
-    if [ -z "$2" ] ; then
-        print_error "no way to link file $1"
+    if [ ! -f "$1" ] ; then	print_info "file $1 not found for link"
+    elif [ -z "$2" ] ; then	print_error "no way to link file $1"
     else
         ln -sf "$1" "$2"
         [ "$?" != 0 ] && print_error "failed to link file $1 to $2" || return 0
@@ -88,8 +88,8 @@ check_symlink () {
 export -f check_symlink
 
 try_force_link_dir () {
-    if [ -z "$2" ] ; then
-        print_error "no way to link directory $1"
+    if [ ! -d "$1" ] ; then	print_info "directory $1 not found for link"
+    elif [ -z "$2" ] ; then	print_error "no way to link directory $1"
     else
         ln -sf "$1" "$2"
         [ "$?" != 0 ] && print_error "failed to link directory $1 to $2" || return 0
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index e624c2c..5d52acf 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -311,14 +311,9 @@ start_portwine () {
     ! -f "${WINEPREFIX}"/userdef.reg || ! -f "${WINEPREFIX}"/system.reg || ! -f "${WINEPREFIX}"/user.reg ]]
     then
         pw_clear_pfx
-        # OLD_PW_WINE_USE="${PW_WINE_USE}"
-        # export PW_WINE_USE=${PW_PROTON_STEAM_VER}
-        # init_wine_ver
         check_dirs_and_files_in_pfx
         ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
         wait_wineserver &&
-        # export PW_WINE_USE="${OLD_PW_WINE_USE}"
-        # init_wine_ver
         echo "${PW_WINE_USE}" > "${WINEPREFIX}/.wine_ver"
     elif [[ -z "`cat "${WINEPREFIX}/.wine_ver" | grep ${PW_WINE_USE}`" ]] ; then 
         check_dirs_and_files_in_pfx