From ce1fb05fc7465daf24cd17860884ffda0fa3d474 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 22 Dec 2025 14:23:31 +0300 Subject: [PATCH] install win cades if WH_USE_CPCSP_CADES=1 --- winehelper | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/winehelper b/winehelper index d5cfc72..a86c5b2 100755 --- a/winehelper +++ b/winehelper @@ -144,6 +144,7 @@ check_variables WH_WINE_USE "wine_x_tkg_10-0_amd64" # or system check_variables WH_USE_CPCSP_PROXY "0" check_variables CPCSP_PROXY_X86_64_VER "0.6.1-alt1" check_variables CPCSP_PROXY_WOW64_VER "0.7.7-alt1-wow64" +check_variables WH_USE_CPCSP_CADES "0" check_variables WH_USE_EXTRA_FONTS "0" check_variables EXTRA_FONTS_VER "01" @@ -1292,24 +1293,26 @@ init_wineprefix () { # настраиваем префикс для работы с cpcsp_proxy if [[ $WH_USE_CPCSP_PROXY == "1" ]] ; then - local cades_ver="release_2_0_14892" - local url_cades_dll="https://cryptopro.ru/sites/default/files/products/cades/$cades_ver" + if [[ $WH_USE_CPCSP_CADES == "1" ]] ; then + local cades_ver="release_2_0_14892" + local url_cades_dll="https://cryptopro.ru/sites/default/files/products/cades/$cades_ver" - if [[ ! -d "$DRIVE_C/Program Files (x86)/Common Files/Crypto Pro/Shared/" ]] - then - local msi_cades32="cades-win32.msi" - try_download cloud "$url_cades_dll/$msi_cades32" "$WH_TMP_DIR/$msi_cades32" - print_info "Установка КриптоПро ЭЦП Runtime ($msi_cades32)" - WINEDLLOVERRIDES="msxml3=b" wine_run "$WH_TMP_DIR/$msi_cades32" /q - fi + if [[ ! -d "$DRIVE_C/Program Files (x86)/Common Files/Crypto Pro/Shared/" ]] + then + local msi_cades32="cades-win32.msi" + try_download cloud "$url_cades_dll/$msi_cades32" "$WH_TMP_DIR/$msi_cades32" + print_info "Установка КриптоПро ЭЦП Runtime ($msi_cades32)" + WINEDLLOVERRIDES="msxml3=b" wine_run "$WH_TMP_DIR/$msi_cades32" /q + fi - if [[ "$WINEARCH" == "win64" ]] \ - && [[ ! -d "$DRIVE_C/Program Files/Common Files/Crypto Pro/Shared" ]] - then - local msi_cades64="cades-x64.msi" - try_download cloud "$url_cades_dll/$msi_cades64" "$WH_TMP_DIR/$msi_cades64" - print_info "Установка КриптоПро ЭЦП Runtime ($msi_cades64)" - WINEDLLOVERRIDES="msxml3=b" wine_run "$WH_TMP_DIR/$msi_cades64" /q + if [[ "$WINEARCH" == "win64" ]] \ + && [[ ! -d "$DRIVE_C/Program Files/Common Files/Crypto Pro/Shared" ]] + then + local msi_cades64="cades-x64.msi" + try_download cloud "$url_cades_dll/$msi_cades64" "$WH_TMP_DIR/$msi_cades64" + print_info "Установка КриптоПро ЭЦП Runtime ($msi_cades64)" + WINEDLLOVERRIDES="msxml3=b" wine_run "$WH_TMP_DIR/$msi_cades64" /q + fi fi if ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg" ; then