diff --git a/autoinstall/alta-expert b/autoinstall/alta-expert index 0c3f6e1..f2897fa 100644 --- a/autoinstall/alta-expert +++ b/autoinstall/alta-expert @@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/expert${ALTA_VERSION}/setup.exe" prepair_wine if try_download "https://www1.alta.ru/pub/packets/distr/expert${ALTA_VERSION}.zip" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE diff --git a/autoinstall/alta-gtd b/autoinstall/alta-gtd index 4323d61..1451403 100644 --- a/autoinstall/alta-gtd +++ b/autoinstall/alta-gtd @@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/gtdw280125/setup.exe" prepair_wine if try_download "https://www2.alta.ru/pub/packets/distr/gtdw280125.zip" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE diff --git a/autoinstall/alta-maximum b/autoinstall/alta-maximum index 9bdbc42..305ca80 100644 --- a/autoinstall/alta-maximum +++ b/autoinstall/alta-maximum @@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/maximum${ALTA_VERSION}/setup.exe" prepair_wine if try_download "https://www2.alta.ru/pub/packets/distr/maximum${ALTA_VERSION}.zip" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE diff --git a/autoinstall/alta-tamdoc b/autoinstall/alta-tamdoc index 9eb23fe..8b9243a 100644 --- a/autoinstall/alta-tamdoc +++ b/autoinstall/alta-tamdoc @@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/ordw030225/setup.exe" prepair_wine if try_download "https://www2.alta.ru/pub/packets/distr/ordw030225.zip" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE diff --git a/autoinstall/alta-tax b/autoinstall/alta-tax index d19fc01..f25a558 100644 --- a/autoinstall/alta-tax +++ b/autoinstall/alta-tax @@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/taxwin040225/setup.exe" prepair_wine if try_download "https://www2.alta.ru/pub/packets/distr/taxwin040225.zip" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE diff --git a/autoinstall/alta-zap b/autoinstall/alta-zap index 127ccbc..2d96ca7 100644 --- a/autoinstall/alta-zap +++ b/autoinstall/alta-zap @@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/zapwin040225/setup.exe" prepair_wine if try_download "https://www1.alta.ru/pub/packets/distr/zapwin040225.zip" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE diff --git a/autoinstall/ctm-finance b/autoinstall/ctm-finance index 8c7881e..fc402ed 100644 --- a/autoinstall/ctm-finance +++ b/autoinstall/ctm-finance @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_fn" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_fn/setup.exe" if try_download "https://files.ctm.ru/FINANCE/SFX/setup_fn.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\FINANCE" /auto /hide diff --git a/autoinstall/ctm-journals b/autoinstall/ctm-journals index 3cc2bd7..bace13b 100644 --- a/autoinstall/ctm-journals +++ b/autoinstall/ctm-journals @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_jr" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_jr/setup.exe" if try_download "https://files.ctm.ru/JOURNALS/SFX/setup_jr.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\JOURNALS" /auto /hide diff --git a/autoinstall/ctm-monitor b/autoinstall/ctm-monitor index fcc5878..769e5ca 100644 --- a/autoinstall/ctm-monitor +++ b/autoinstall/ctm-monitor @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_me" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_me/setup.exe" if try_download "https://files.ctm.ru/MONITOR_ED/SFX/setup_me.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\MONITOR_ED" /auto /hide diff --git a/autoinstall/ctm-report b/autoinstall/ctm-report index 6dffeca..a08338f 100644 --- a/autoinstall/ctm-report +++ b/autoinstall/ctm-report @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rp" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rp/setup.exe" if try_download "https://ftp.ctm.ru/REPORT/SFX/setup_rp.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\REPORT" /auto /hide diff --git a/autoinstall/ctm-service b/autoinstall/ctm-service index d00b844..dd2094e 100644 --- a/autoinstall/ctm-service +++ b/autoinstall/ctm-service @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cs" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/setup.exe" if try_download "https://files.ctm.ru/CSERVICE/SFX/setup_cs.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\CSERVICE" /auto /hide diff --git a/autoinstall/easymnemo b/autoinstall/easymnemo index 6902b26..f05ae66 100644 --- a/autoinstall/easymnemo +++ b/autoinstall/easymnemo @@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/Easymnemo/EasyMnemo.msi" prepair_wine if try_download "https://s.siteapi.org/c6e311629e736a8.ru/docs/j3pdl4vxv5wkg0sg0ksks40k8ss0sc" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /q diff --git a/autoinstall/spravki-bk b/autoinstall/spravki-bk index c619b7b..1b5a234 100644 --- a/autoinstall/spravki-bk +++ b/autoinstall/spravki-bk @@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/SpravkiBk/SpravkiBk-2-5-5-2275-Internet.msi" prepair_wine if try_download "https://spravki-bk.ru/wp-content/uploads/СПО-Справки-БК-(версия-2.5.5)-от-31.01.2024.zip" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /q diff --git a/autoinstall/t-flex-cad-edu17 b/autoinstall/t-flex-cad-edu17 index d19120b..8a17ece 100644 --- a/autoinstall/t-flex-cad-edu17 +++ b/autoinstall/t-flex-cad-edu17 @@ -21,7 +21,7 @@ then AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux" AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg" if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then - 7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}" + unpack "${AUTOINSTALL_ZIP_LIN}" "${AUTOINSTALL_DIR_LIN}" try_remove_file "$AUTOINSTALL_ZIP_LIN" "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}" fi @@ -34,10 +34,10 @@ then AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007" AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi" if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then - 7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}" + unpack "${AUTOINSTALL_ZIP_WIN}" "${AUTOINSTALL_DIRWIN}" try_remove_file "$AUTOINSTALL_ZIP_WIN" - 7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}" + unpack "${AUTOINSTALL_EXE_WIN1}" "${AUTOINSTALL_EXE_WIN_MSY}" try_remove_file "$AUTOINSTALL_EXE_WIN1" wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q @@ -80,7 +80,7 @@ export AUTOINSTALL_COMPONENTS="${WH_TMP_DIR}/Компоненты поддерж export AUTOINSTALL_ELEMENTS="${WH_TMP_DIR}/Стандартные элементы 17/Стандартные элементы 17.msi" if try_download "https://www.tflexcad.ru/download/t-flex-cad-free/files/TFCAD_ST_17x64_PACK.zip" "${AUTOINSTALL_ZIP}" ; then - 7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}" + unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}" try_remove_file "${AUTOINSTALL_ZIP}" wine_run_install "${AUTOINSTALL_EDUCATION}" /q diff --git a/autoinstall/t-flex-cad17 b/autoinstall/t-flex-cad17 index 958ba7d..6a29d09 100644 --- a/autoinstall/t-flex-cad17 +++ b/autoinstall/t-flex-cad17 @@ -21,7 +21,7 @@ then AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux" AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg" if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then - 7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}" + unpack "${AUTOINSTALL_ZIP_LIN}" "${AUTOINSTALL_DIR_LIN}" try_remove_file "$AUTOINSTALL_ZIP_LIN" "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}" fi @@ -34,10 +34,10 @@ then AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007" AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi" if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then - 7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}" + unpack "${AUTOINSTALL_ZIP_WIN}" "${AUTOINSTALL_DIRWIN}" try_remove_file "$AUTOINSTALL_ZIP_WIN" - 7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}" + unpack "${AUTOINSTALL_EXE_WIN1}" "${AUTOINSTALL_EXE_WIN_MSY}" try_remove_file "$AUTOINSTALL_EXE_WIN1" wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q @@ -78,7 +78,7 @@ export AUTOINSTALL_DIR="${WH_TMP_DIR}" export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX CAD 17/T-FLEX CAD 17.msi" if try_download "https://www.tflex.ru/downloads/T-FLEX%20CAD%2017.zip" "${AUTOINSTALL_ZIP}" ; then - 7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}" + unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}" try_remove_file "${AUTOINSTALL_ZIP}" wine_run_install "${AUTOINSTALL_EXE}" /q diff --git a/autoinstall/t-flex-cad17-applications b/autoinstall/t-flex-cad17-applications index 6f2eda7..341d51d 100644 --- a/autoinstall/t-flex-cad17-applications +++ b/autoinstall/t-flex-cad17-applications @@ -25,7 +25,7 @@ prepair_wine # Функция для распаковки файла unpack_file() { local archive="$1" - 7z x -y "$archive" -o"${UNPACK_APP}" + unpack "$archive" "${UNPACK_APP}" } # Функция для установки .msi файлов diff --git a/autoinstall/t-flex-cad17-resources b/autoinstall/t-flex-cad17-resources index cf460f7..af47171 100644 --- a/autoinstall/t-flex-cad17-resources +++ b/autoinstall/t-flex-cad17-resources @@ -23,7 +23,7 @@ prepair_wine # Функция для распаковки файла unpack_file() { local archive="$1" - 7z x -y "$archive" -o"${UNPACK_RESOURCES}" + unpack "$archive" "${UNPACK_RESOURCES}" } # Функция для установки .msi файлов diff --git a/autoinstall/t-flex-cad2d+17 b/autoinstall/t-flex-cad2d+17 index aac6b24..029c73f 100644 --- a/autoinstall/t-flex-cad2d+17 +++ b/autoinstall/t-flex-cad2d+17 @@ -21,7 +21,7 @@ then AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux" AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg" if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then - 7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}" + unpack "${AUTOINSTALL_ZIP_LIN}" "${AUTOINSTALL_DIR_LIN}" try_remove_file "$AUTOINSTALL_ZIP_LIN" "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}" fi @@ -34,10 +34,10 @@ then AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007" AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi" if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then - 7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}" + unpack "${AUTOINSTALL_ZIP_WIN}" "${AUTOINSTALL_DIRWIN}" try_remove_file "$AUTOINSTALL_ZIP_WIN" - 7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}" + unpack "${AUTOINSTALL_EXE_WIN1}" "${AUTOINSTALL_EXE_WIN_MSY}" try_remove_file "$AUTOINSTALL_EXE_WIN1" wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q @@ -78,7 +78,7 @@ export AUTOINSTALL_DIR="${WH_TMP_DIR}" export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX CAD 2D+ 17/T-FLEX CAD 2D+ 17.msi" if try_download "https://www.tflex.ru/downloads/T-FLEX%20CAD%202D+%2017.zip" "${AUTOINSTALL_ZIP}" ; then - 7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}" + unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}" try_remove_file "${AUTOINSTALL_ZIP}" wine_run_install "${AUTOINSTALL_EXE}" /q diff --git a/autoinstall/t-flex-doc17 b/autoinstall/t-flex-doc17 index f4890fd..a74db2c 100644 --- a/autoinstall/t-flex-doc17 +++ b/autoinstall/t-flex-doc17 @@ -23,7 +23,7 @@ then AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux" AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg" if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then - 7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}" + unpack "${AUTOINSTALL_ZIP_LIN}" "${AUTOINSTALL_DIR_LIN}" try_remove_file "$AUTOINSTALL_ZIP_LIN" "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}" fi @@ -36,10 +36,10 @@ then AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007" AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi" if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then - 7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}" + unpack "${AUTOINSTALL_ZIP_WIN}" "${AUTOINSTALL_DIRWIN}" try_remove_file "$AUTOINSTALL_ZIP_WIN" - 7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}" + unpack "${AUTOINSTALL_EXE_WIN1}" "${AUTOINSTALL_EXE_WIN_MSY}" try_remove_file "$AUTOINSTALL_EXE_WIN1" wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q @@ -80,7 +80,7 @@ AUTOINSTALL_DIR="${WH_TMP_DIR}/T-FLEX DOCs 17" AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX DOCs 17/T-FLEX DOCs 17/T-FLEX DOCs 17.msi" if try_download "https://www.tflex.ru/downloads/DOCs/T-FLEX%20DOCs%2017%20Client.zip" "${AUTOINSTALL_ZIP}" ; then - 7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}" + unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}" try_remove_file "${AUTOINSTALL_ZIP}" wine_run_install "${AUTOINSTALL_EXE}" /q diff --git a/autoinstall/t-flex-viewer17 b/autoinstall/t-flex-viewer17 index d3252ee..a4dcf94 100644 --- a/autoinstall/t-flex-viewer17 +++ b/autoinstall/t-flex-viewer17 @@ -21,7 +21,7 @@ then AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux" AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg" if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then - 7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}" + unpack "${AUTOINSTALL_ZIP_LIN}" "${AUTOINSTALL_DIR_LIN}" try_remove_file "$AUTOINSTALL_ZIP_LIN" "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}" fi @@ -34,10 +34,10 @@ then AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007" AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi" if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then - 7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}" + unpack "${AUTOINSTALL_ZIP_WIN}" "${AUTOINSTALL_DIRWIN}" try_remove_file "$AUTOINSTALL_ZIP_WIN" - 7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}" + unpack "${AUTOINSTALL_EXE_WIN1}" "${AUTOINSTALL_EXE_WIN_MSY}" try_remove_file "$AUTOINSTALL_EXE_WIN1" wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q @@ -78,7 +78,7 @@ export AUTOINSTALL_DIR="${WH_TMP_DIR}" export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX Viewer 17/T-FLEX Viewer 17.msi" if try_download "https://www.tflex.ru/downloads/T-FLEX%20Viewer%2017.zip" "${AUTOINSTALL_ZIP}" ; then - 7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}" + unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}" try_remove_file "${AUTOINSTALL_ZIP}" wine_run_install "${AUTOINSTALL_EXE}" /q diff --git a/autoinstall/ved-alf b/autoinstall/ved-alf index ab822c5..33d0c55 100644 --- a/autoinstall/ved-alf +++ b/autoinstall/ved-alf @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_al" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_al/setup.exe" if try_download "https://ftp.ctm.ru/ALPHABET/SFX/setup_al.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\ALPHABET" /auto /hide diff --git a/autoinstall/ved-control b/autoinstall/ved-control index 39634c8..36e5991 100644 --- a/autoinstall/ved-control +++ b/autoinstall/ved-control @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cl" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cl/setup.exe" if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_cl.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\CONTROL" /auto /hide diff --git a/autoinstall/ved-dcl b/autoinstall/ved-dcl index bd15874..d5d5598 100644 --- a/autoinstall/ved-dcl +++ b/autoinstall/ved-dcl @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_dl" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_dl/setup.exe" if try_download "https://ftp.ctm.ru/DCL/SFX/setup_dl.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\DCL" /auto /hide diff --git a/autoinstall/ved-info b/autoinstall/ved-info index ade73aa..7b23ff8 100644 --- a/autoinstall/ved-info +++ b/autoinstall/ved-info @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_vi" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_vi/setup.exe" if try_download "https://ftp.ctm.ru/VEDINFO/SFX/setup_vi.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\VED_INFO" /auto /hide diff --git a/autoinstall/ved-payments b/autoinstall/ved-payments index 5d36aa3..c0d82da 100644 --- a/autoinstall/ved-payments +++ b/autoinstall/ved-payments @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_pa" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_pa/setup.exe" if try_download "https://ftp.ctm.ru/PAYMENT/SFX/setup_pa.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\PAYMENT" /auto /hide diff --git a/autoinstall/ved-sts b/autoinstall/ved-sts index 5cf3d59..e061cbb 100644 --- a/autoinstall/ved-sts +++ b/autoinstall/ved-sts @@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_st" AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_st/setup.exe" if try_download "https://ftp.ctm.ru/STS/SFX/setup_st.exe" "${AUTOINSTALL_EXE}" ; then - 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}" + unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}" try_remove_file "$AUTOINSTALL_EXE" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\STS" /auto /hide diff --git a/manualinstall/daobit-cservice b/manualinstall/daobit-cservice index 4cf6c02..57bad1b 100644 --- a/manualinstall/daobit-cservice +++ b/manualinstall/daobit-cservice @@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_cs.exe" if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then prepair_wine - 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" + unpack "$2" "${AUTOINSTALL_UNPACK}" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\CSERVICE" /auto /hide WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/CSERVICE/CService32.exe" diff --git a/manualinstall/daobit-ratlas b/manualinstall/daobit-ratlas index 5990132..16252ab 100644 --- a/manualinstall/daobit-ratlas +++ b/manualinstall/daobit-ratlas @@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_rk.exe" if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then prepair_wine - 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" + unpack "$2" "${AUTOINSTALL_UNPACK}" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RAtlas" /auto /hide WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RAtlas/ratlas.exe" diff --git a/manualinstall/daobit-rinfo b/manualinstall/daobit-rinfo index b21dbbb..91f6d04 100644 --- a/manualinstall/daobit-rinfo +++ b/manualinstall/daobit-rinfo @@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_ri.exe" if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then prepair_wine - 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" + unpack "$2" "${AUTOINSTALL_UNPACK}" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RInfo" /auto /hide WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RInfo/rinfo.exe" diff --git a/manualinstall/daobit-rtariff b/manualinstall/daobit-rtariff index d2ec439..27b4e17 100644 --- a/manualinstall/daobit-rtariff +++ b/manualinstall/daobit-rtariff @@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_rt.exe" if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then prepair_wine - 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" + unpack "$2" "${AUTOINSTALL_UNPACK}" wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RTariff" /auto /hide WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RTariff/Tariff.exe"