diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 771c860a..b0237887 100644 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -15,6 +15,11 @@ * добавить контроль за окнами для правильного отключения прогресс бара * зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 1078### +* добавлена проверка подключения к интернету с помощью ping перед использованием curl (значительно ускоряет запуск порта при плохом соединении с интернетом) +* обновлены libs_v12 (пересобран контейнер и значительно уменьшен его размер) +* HOTFIX - запуск winetricks из GUI PortProton (контейнер уже умеет работать с winetricks, но всё еще есть недочеты по отображению gui) + ###Scripts version 1077### * HOTFIX - исправлено повторное скачивание libs_v11 diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 8a045768..0b41b2cc 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -459,11 +459,11 @@ STOP_PORTWINE () { UPDATE_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=//')" + pw_ping_test && W_TRX_EXT_VER="$(curl -s --list-only ${W_TRX_URL} | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" print_info "Version winetricks on server: ${W_TRX_EXT_VER}" W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" print_info "Version winetricks in port: ${W_TRX_INT_VER}" - if [ ! -f "${PORT_WINE_TMP_PATH}/winetricks" ] || [ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" ] ; then + if [ ! -f "${PORT_WINE_TMP_PATH}/winetricks" ] && [ ! -z "$W_TRX_EXT_VER" ] || [ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" ] && [ ! -z "$W_TRX_EXT_VER" ]; then if try_download "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks_new" ; then mv -f "${PORT_WINE_TMP_PATH}/winetricks_new" "${PORT_WINE_TMP_PATH}/winetricks" W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" && print_info "Winetricks version in port has been updated (${W_TRX_INT_VER})" @@ -547,7 +547,7 @@ PW_UPDATE () { fi read "update_not" < "${PORT_WINE_TMP_PATH}/update_notifier" if [ "${update_not}" = "1" ] ; then - echo `curl -s --list-only "${PW_FTP_URL}/current_version/${portname}_ver"` > "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" + pw_ping_test && echo `curl -s --list-only "${PW_FTP_URL}/current_version/${portname}_ver"` > "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" if [ -f "${PORT_WINE_TMP_PATH}/${portname}_ver" ] ; then read current_ver < "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" try_remove_file "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" @@ -717,7 +717,7 @@ PW_SCRIPTS_UPDATE () { if [ ! -f "${PORT_WINE_TMP_PATH}/scripts_ver" ] ; then echo "1000" > "${PORT_WINE_TMP_PATH}/scripts_ver" fi - echo `curl -s --list-only "${PW_FTP_URL}/current_version/scripts_ver"` > "${PORT_WINE_TMP_PATH}/scripts_cur_ver" + pw_ping_test && echo `curl -s --list-only "${PW_FTP_URL}/current_version/scripts_ver"` > "${PORT_WINE_TMP_PATH}/scripts_cur_ver" if [ "$?" == "0" ] ; then read scripts_current_ver < "${PORT_WINE_TMP_PATH}/scripts_cur_ver" try_remove_file "${PORT_WINE_TMP_PATH}/scripts_cur_ver" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 5b91cb48..4c15362e 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -187,7 +187,7 @@ PW_WINETRICKS () { UPDATE_WINETRICKS export PW_USE_TERMINAL=1 START_PORTWINE - "${PORT_WINE_TMP_PATH}/winetricks" -qr --force + "${PORT_WINE_TMP_PATH}/winetricks" -q -r --force } PW_EDIT_DB () { xdg-open "${PORTWINE_DB_FILE}" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 732db897..665d9a11 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -23,7 +23,7 @@ export WINEARCH="win64" export mono_ver=6.1.2 export gecko_ver=2.47.2 -export pw_libs_ver="_v11" +export pw_libs_ver="_v12" export PW_FORCE_LARGE_ADDRESS_AWARE=1