Compare commits
13 Commits
0.4.5
...
hotfix_abc
Author | SHA1 | Date | |
---|---|---|---|
b257dbaa7e | |||
206e6f5467 | |||
973ae4c61a | |||
30cab1f4d1 | |||
6374e30797 | |||
a1500e320b | |||
5af77fee07 | |||
8e96de0626 | |||
a2b12327d4 | |||
b00702c77f | |||
74d8facc08 | |||
0fa3e567ba | |||
8e2a76414b |
42
auto_completion/bash_completion/winehelper
Normal file
42
auto_completion/bash_completion/winehelper
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
# Auto-completion for winhelper
|
||||||
|
_winehelper_completions() {
|
||||||
|
local cur prev opts
|
||||||
|
COMPREPLY=()
|
||||||
|
cur="${COMP_WORDS[COMP_CWORD]}"
|
||||||
|
prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||||
|
opts="--help --version --debug install installed -r -i remove-all --clear-pfx killall remove-prefix backup-prefix restore-prefix"
|
||||||
|
wine_cmd="winecfg winereg winefile wineconsole winetricks desktop regedit explorer cmd run"
|
||||||
|
|
||||||
|
case "${prev}" in
|
||||||
|
winehelper)
|
||||||
|
COMPREPLY=( $(compgen -W "${opts} ${wine_cmd}" -- "${cur}") )
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--debug)
|
||||||
|
COMPREPLY=( $(compgen -W "${wine_cmd}" -- "${cur}") )
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
install|-i)
|
||||||
|
local scripts="$(ls -1 /usr/share/winehelper/autoinstall) $(ls -1 /usr/share/winehelper/manualinstall)"
|
||||||
|
COMPREPLY=( $(compgen -W "list ${scripts}" -- "${cur}") )
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
run|installed)
|
||||||
|
local installed=$(grep -h "Exec=env" ~/.local/share/winehelper/*.desktop 2>/dev/null | awk -F'/' '{print $NF}' | awk -F'"' '{print $1}')
|
||||||
|
COMPREPLY=( $(compgen -W "${installed}" -- "${cur}") )
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
remove-prefix|backup-prefix)
|
||||||
|
local prefixes=$(ls -1 ~/.local/share/winehelper/prefixes 2>/dev/null)
|
||||||
|
COMPREPLY=( $(compgen -W "${prefixes}" -- "${cur}") )
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
restore-prefix)
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
complete -F _winehelper_completions winehelper
|
BIN
image/abc-dps.png
Normal file
BIN
image/abc-dps.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 23 KiB |
BIN
image/abc-erp-bim.png
Normal file
BIN
image/abc-erp-bim.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 24 KiB |
BIN
image/abc-pir.png
Normal file
BIN
image/abc-pir.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 8.9 KiB |
BIN
image/abc-recomposerwl.png
Normal file
BIN
image/abc-recomposerwl.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 9.0 KiB |
BIN
image/abc.png
Normal file
BIN
image/abc.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
BIN
image/abc_akkord.png
Normal file
BIN
image/abc_akkord.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.4 KiB |
25
testinstall/abc-akkord-pos
Normal file
25
testinstall/abc-akkord-pos
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# info_ru: Автоматизация контроля координации организационно-распорядительной деятельности. ПОС Редакция.
|
||||||
|
########################################################################
|
||||||
|
export WH_WINE_USE="wine-9.0.14-alt1-amd64"
|
||||||
|
export WINEPREFIX="abccenter"
|
||||||
|
export PROG_NAME="АВС АККОРД ПОС"
|
||||||
|
export PROG_ICON="abc_akkord"
|
||||||
|
export BASE_PFX="none"
|
||||||
|
export WH_WINDOWS_VER="10"
|
||||||
|
export WINEARCH="win64"
|
||||||
|
# export INSTALL_DLL=""
|
||||||
|
|
||||||
|
prepair_wine
|
||||||
|
# Возможны точки либо нижнее подчеркивание в URL-адресе
|
||||||
|
try_get_page "https://abccenter.ru/download-ru/"
|
||||||
|
VERDATE=$(read_page | grep -oP 'akkord_pos_\K\d+[._]\d+[._]\d+[._]\d+_\d+-\d+-\d+')
|
||||||
|
AUTOINSTALL_EXE="${WH_TMP_DIR}/akkord_pos_${VERDATE}.exe"
|
||||||
|
|
||||||
|
if try_download "https://abccenter.ru/wp-content/soft/akkord_pos_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
|
||||||
|
wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||||
|
try_remove_file "$AUTOINSTALL_EXE"
|
||||||
|
|
||||||
|
WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/AKKORD POS/ABCAKKORD.exe"
|
||||||
|
create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
|
||||||
|
fi
|
26
testinstall/abc-akkord-pro
Normal file
26
testinstall/abc-akkord-pro
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# info_ru: Автоматизация контроля координации организационно-распорядительной деятельности. Профессиональная Редакция.
|
||||||
|
########################################################################
|
||||||
|
export WH_WINE_USE="wine-9.0.14-alt1-amd64"
|
||||||
|
export WINEPREFIX="abccenter"
|
||||||
|
export PROG_NAME="АВС АККОРД Профессиональный"
|
||||||
|
export PROG_ICON="abc_akkord"
|
||||||
|
export BASE_PFX="none"
|
||||||
|
export WH_WINDOWS_VER="10"
|
||||||
|
export WINEARCH="win64"
|
||||||
|
# export INSTALL_DLL=""
|
||||||
|
|
||||||
|
prepair_wine
|
||||||
|
# Возможны точки либо нижнее подчеркивание в URL-адресе
|
||||||
|
try_get_page "https://abccenter.ru/download-ru/"
|
||||||
|
VERDATE=$(read_page | grep -oP 'akkord_pro_\K\d+[._]\d+[._]\d+[._]\d+_\d+-\d+-\d+')
|
||||||
|
AUTOINSTALL_EXE="${WH_TMP_DIR}/akkord_pro_${VERDATE}.exe"
|
||||||
|
|
||||||
|
if try_download "https://abccenter.ru/wp-content/soft/akkord_pro_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
|
||||||
|
wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||||
|
try_remove_file "$AUTOINSTALL_EXE"
|
||||||
|
try_remove_file "$ABC_FILE"
|
||||||
|
|
||||||
|
WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/AKKORD PRO/ABCAKKORD.exe"
|
||||||
|
create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
|
||||||
|
fi
|
22
testinstall/abc-bim-plugins
Normal file
22
testinstall/abc-bim-plugins
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# info_ru: Комплект плагинов «Сметная система АВС» к BIM-системам.
|
||||||
|
########################################################################
|
||||||
|
export WH_WINE_USE="wine-9.0.14-alt1-amd64"
|
||||||
|
export WINEPREFIX="abccenter"
|
||||||
|
export PROG_NAME="ABC-BIM-Plugins-RU"
|
||||||
|
export BASE_PFX="none"
|
||||||
|
export WH_WINDOWS_VER="10"
|
||||||
|
export WINEARCH="win64"
|
||||||
|
# export INSTALL_DLL=""
|
||||||
|
|
||||||
|
prepair_wine
|
||||||
|
# Возможны точки либо нижнее подчеркивание в URL-адресе
|
||||||
|
try_get_page "https://abccenter.ru/download-ru/"
|
||||||
|
VERSION=$(read_page | grep -oP 'ABC-BIM-Plugins-RU_\K\d+[._]\d+[._]\d+'| sed -E 's/[._]/./g')
|
||||||
|
AUTOINSTALL_EXE="${WH_TMP_DIR}/ABC-BIM-Plugins-RU_${VERSION}.exe"
|
||||||
|
|
||||||
|
if try_download "https://abccenter.ru/wp-content/soft/ABC-BIM-Plugins-RU_${VERSION}_Setup.exe" "${AUTOINSTALL_EXE}" ; then
|
||||||
|
wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||||
|
try_remove_file "$AUTOINSTALL_EXE"
|
||||||
|
try_remove_file "$ABC_FILE"
|
||||||
|
fi
|
29
testinstall/abc-bim-ru
Normal file
29
testinstall/abc-bim-ru
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# info_ru: Интеграция сметной системы АВС с BIM-платформами.
|
||||||
|
########################################################################
|
||||||
|
export WH_WINE_USE="wine-9.0.14-alt1-amd64"
|
||||||
|
export WINEPREFIX="abccenter"
|
||||||
|
PROG_NAME=("BIM-смета АВС-RU" "АВС Рекомпозитор")
|
||||||
|
export BASE_PFX="none"
|
||||||
|
export WH_WINDOWS_VER="10"
|
||||||
|
export WINEARCH="win64"
|
||||||
|
# export INSTALL_DLL=""
|
||||||
|
|
||||||
|
prepair_wine
|
||||||
|
# Возможны точки либо нижнее подчеркивание в URL-адресе
|
||||||
|
try_get_page "https://abccenter.ru/download-ru/"
|
||||||
|
VERDATE=$(read_page | grep -oP 'Setup_ABC-BIM-RU_\K\d+[._]\d+_\d+-\d+-\d+')
|
||||||
|
VERSION=$(read_page | grep -oP 'Setup_ABC-BIM-RU_\K\d+[._]\d+' | sed -E 's/[._]/./g')
|
||||||
|
AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-BIM-RU_${VERDATE}_trial.exe"
|
||||||
|
|
||||||
|
if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC-BIM-RU_${VERDATE}_trial.exe" "${AUTOINSTALL_EXE}" ; then
|
||||||
|
wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||||
|
try_remove_file "$AUTOINSTALL_EXE"
|
||||||
|
try_remove_file "$ABC_FILE"
|
||||||
|
|
||||||
|
WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-RU/${VERSION}/Abc_win/Exec/Abc.exe"
|
||||||
|
WIN_FILE_EXEC1="$DRIVE_C/ABC-Soft/ABC RECOMPOSER/abcrecomposerwl.exe"
|
||||||
|
|
||||||
|
create_desktop "BIM-смета АВС-RU ${VERSION}" "$WIN_FILE_EXEC" "abc"
|
||||||
|
create_desktop "АВС Рекомпозитор" "$WIN_FILE_EXEC1" "abc-recomposerwl"
|
||||||
|
fi
|
27
testinstall/abc-dps-ru
Normal file
27
testinstall/abc-dps-ru
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# info_ru: АВС-ЦСП предназначен для автоматизированного составления и выпуска спецификаций материалов и оборудования, а также формирования ведомостей объемов работ (ВОР) путем связывания материальных ресурсов, включаемых в спецификации, с видами работ.
|
||||||
|
########################################################################
|
||||||
|
export WH_WINE_USE="wine-9.0.14-alt1-amd64"
|
||||||
|
export WINEPREFIX="abccenter"
|
||||||
|
export PROG_NAME="Цифровая спецификация проекта"
|
||||||
|
export PROG_ICON="abc-dps"
|
||||||
|
export BASE_PFX="none"
|
||||||
|
export WH_WINDOWS_VER="10"
|
||||||
|
export WINEARCH="win64"
|
||||||
|
# export INSTALL_DLL=""
|
||||||
|
|
||||||
|
prepair_wine
|
||||||
|
# Возможны точки либо нижнее подчеркивание в URL-адресе
|
||||||
|
try_get_page "https://abccenter.ru/download-ru/"
|
||||||
|
VERDATE=$(read_page | grep -oP 'Setup_ABC_DPS_RU_\K\d+[._]\d+_\d+-\d+-\d+')
|
||||||
|
VERSION=$(read_page | grep -oP 'Setup_ABC_DPS_RU_\K\d+[._]\d+'| sed -E 's/[._]/./g')
|
||||||
|
AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC_DPS_RU_${VERDATE}.exe"
|
||||||
|
|
||||||
|
if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC_DPS_RU_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
|
||||||
|
wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||||
|
try_remove_file "$AUTOINSTALL_EXE"
|
||||||
|
try_remove_file "$ABC_FILE"
|
||||||
|
|
||||||
|
WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-DPS RU/${VERSION}/ABCSpecificate.exe"
|
||||||
|
create_desktop "$PROG_NAME RU ${VERSION}" "$WIN_FILE_EXEC" "$PROG_ICON"
|
||||||
|
fi
|
25
testinstall/abc-erp-bim
Normal file
25
testinstall/abc-erp-bim
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# info_ru: Конвертер в формат АВС_ERP_BIM_XML.
|
||||||
|
########################################################################
|
||||||
|
export WH_WINE_USE="wine-9.0.14-alt1-amd64"
|
||||||
|
export WINEPREFIX="abccenter"
|
||||||
|
export PROG_NAME="Конвертер в формат АВС_ERP_BIM_XML"
|
||||||
|
export PROG_ICON="abc-erp-bim"
|
||||||
|
export BASE_PFX="none"
|
||||||
|
export WH_WINDOWS_VER="10"
|
||||||
|
export WINEARCH="win64"
|
||||||
|
# export INSTALL_DLL=""
|
||||||
|
|
||||||
|
prepair_wine
|
||||||
|
AUTOINSTALL_EXE="${WH_TMP_DIR}/abc_erp_bim_converter.exe"
|
||||||
|
|
||||||
|
if try_download "https://abccenter.ru/wp-content/soft/abc_erp_bim_converter.exe" "${AUTOINSTALL_EXE}" ; then
|
||||||
|
mkdir -p "$DRIVE_C/ABC-Soft/abc_erp_bim_converter"
|
||||||
|
try_copy_file "${AUTOINSTALL_EXE}" "$DRIVE_C/ABC-Soft/abc_erp_bim_converter"
|
||||||
|
|
||||||
|
try_remove_file "$AUTOINSTALL_EXE"
|
||||||
|
try_remove_file "$ABC_FILE"
|
||||||
|
|
||||||
|
WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/abc_erp_bim_converter.exe"
|
||||||
|
create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
|
||||||
|
fi
|
27
testinstall/abc-pir-ru
Normal file
27
testinstall/abc-pir-ru
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# info_ru: Программный продукт АВС «ПИР» предназначен для подготовки, расчета и выпуска смет на проектно-изыскательские работы.
|
||||||
|
########################################################################
|
||||||
|
export WH_WINE_USE="wine-9.0.14-alt1-amd64"
|
||||||
|
export WINEPREFIX="abccenter"
|
||||||
|
export PROG_NAME="АВС-ПИР"
|
||||||
|
export PROG_ICON="abc-pir"
|
||||||
|
export BASE_PFX="none"
|
||||||
|
export WH_WINDOWS_VER="10"
|
||||||
|
export WINEARCH="win64"
|
||||||
|
# export INSTALL_DLL=""
|
||||||
|
|
||||||
|
prepair_wine
|
||||||
|
# Возможны точки либо нижнее подчеркивание в URL-адресе
|
||||||
|
try_get_page "https://abccenter.ru/download-ru/"
|
||||||
|
VERDATE=$(read_page | grep -oP 'Setup_ABC-PIR-RU_\K\d+[._]\d+_\d+-\d+-\d+')
|
||||||
|
VERSION=$(read_page | grep -oP 'Setup_ABC-PIR-RU_\K\d+[._]\d+'| sed -E 's/[._]/./g')
|
||||||
|
AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-PIR-RU_${VERDATE}.exe"
|
||||||
|
|
||||||
|
if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC-PIR-RU_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
|
||||||
|
wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||||
|
try_remove_file "$AUTOINSTALL_EXE"
|
||||||
|
try_remove_file "$ABC_FILE"
|
||||||
|
|
||||||
|
WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-PIR/${VERSION}RU/ABC-PIR.exe"
|
||||||
|
create_desktop "$PROG_NAME ${VERSION}RU" "$WIN_FILE_EXEC" "$PROG_ICON"
|
||||||
|
fi
|
27
testinstall/abc-recomposer
Normal file
27
testinstall/abc-recomposer
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# info_ru: Программный комплекс АВС-Рекомпозитор.
|
||||||
|
########################################################################
|
||||||
|
export WH_WINE_USE="wine-9.0.14-alt1-amd64"
|
||||||
|
export WINEPREFIX="abccenter"
|
||||||
|
export PROG_NAME="АВС Рекомпозитор"
|
||||||
|
export PROG_ICON="abc-recomposerwl"
|
||||||
|
export BASE_PFX="none"
|
||||||
|
export WH_WINDOWS_VER="10"
|
||||||
|
export WINEARCH="win64"
|
||||||
|
# export INSTALL_DLL=""
|
||||||
|
|
||||||
|
prepair_wine
|
||||||
|
# Возможны точки либо нижнее подчеркивание в URL-адресе
|
||||||
|
try_get_page "https://abccenter.ru/download-ru/"
|
||||||
|
VERDATE=$(read_page | grep -oP 'abcrecomposer_\K\d+[._]\d+[._]\d+-\d+-\d+')
|
||||||
|
VERSION=$(read_page | grep -oP 'abcrecomposer_\K\d+[._]\d+' | sed -E 's/[._]/./g')
|
||||||
|
AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-RU_${VERDATE}.exe"
|
||||||
|
|
||||||
|
if try_download "https://abccenter.ru/wp-content/soft/abcrecomposer_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
|
||||||
|
wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||||
|
try_remove_file "$AUTOINSTALL_EXE"
|
||||||
|
try_remove_file "$ABC_FILE"
|
||||||
|
|
||||||
|
WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC RECOMPOSER/${VERSION}/abcrecomposerwl.exe"
|
||||||
|
create_desktop "$PROG_NAME $VERSION" "$WIN_FILE_EXEC" "$PROG_ICON"
|
||||||
|
fi
|
27
testinstall/abc-ru
Normal file
27
testinstall/abc-ru
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# info_ru: Система АВС предназначена для разработки сметной и ресурсной документации всеми участниками инвестиционного процесса: проектными, подрядными организациями и заказчиками строительства.
|
||||||
|
########################################################################
|
||||||
|
export WH_WINE_USE="wine-9.0.14-alt1-amd64"
|
||||||
|
export WINEPREFIX="abccenter"
|
||||||
|
export PROG_NAME="ABC-RU"
|
||||||
|
export PROG_ICON="abc"
|
||||||
|
export BASE_PFX="none"
|
||||||
|
export WH_WINDOWS_VER="10"
|
||||||
|
export WINEARCH="win64"
|
||||||
|
# export INSTALL_DLL=""
|
||||||
|
|
||||||
|
prepair_wine
|
||||||
|
# Возможны точки либо нижнее подчеркивание в URL-адресе
|
||||||
|
try_get_page "https://abccenter.ru/download-ru/"
|
||||||
|
VERDATE=$(read_page | grep -oP 'Setup_ABC-RU_\K\d+[._]\d+[._]\d+-\d+-\d+')
|
||||||
|
VERSION=$(read_page | grep -oP 'Setup_ABC-RU_\K\d+[._]\d+' | sed -E 's/[._]/./g')
|
||||||
|
AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-RU_${VERDATE}.exe"
|
||||||
|
|
||||||
|
if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC-RU_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
|
||||||
|
wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
||||||
|
try_remove_file "$AUTOINSTALL_EXE"
|
||||||
|
try_remove_file "$ABC_FILE"
|
||||||
|
|
||||||
|
WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-RU/${VERSION}/Abc_win/Exec/Abc.exe"
|
||||||
|
create_desktop "$PROG_NAME $VERSION" "$WIN_FILE_EXEC" "$PROG_ICON"
|
||||||
|
fi
|
50
winehelper
50
winehelper
@ -46,11 +46,11 @@ check_variables () { [[ -z ${!1} ]] && export $1="$2" ;}
|
|||||||
if [[ "$1" == "--debug" ]] ; then
|
if [[ "$1" == "--debug" ]] ; then
|
||||||
check_variables WINEDEBUG "+loaddll,+seh"
|
check_variables WINEDEBUG "+loaddll,+seh"
|
||||||
export DXVK_LOG_LEVEL="error"
|
export DXVK_LOG_LEVEL="error"
|
||||||
export VKD3D_DEBUG "error"
|
export VKD3D_DEBUG="error"
|
||||||
export WINE_MONO_TRACE "E:System.NotImplementedException"
|
export WINE_MONO_TRACE="E:System.NotImplementedException"
|
||||||
export VK_LOADER_DEBUG "error"
|
export VK_LOADER_DEBUG="error"
|
||||||
export VKBASALT_LOG_LEVEL "error"
|
export VKBASALT_LOG_LEVEL="error"
|
||||||
export DXVK_NVAPI_LOG_LEVEL "error"
|
export DXVK_NVAPI_LOG_LEVEL="error"
|
||||||
shift
|
shift
|
||||||
else
|
else
|
||||||
check_variables WINEDEBUG "-all"
|
check_variables WINEDEBUG "-all"
|
||||||
@ -83,6 +83,7 @@ WH_IMAGE_PATH="$DATA_PATH/image"
|
|||||||
WH_DB_DIR="$DATA_PATH/database"
|
WH_DB_DIR="$DATA_PATH/database"
|
||||||
WH_AUTOINSTALL_DIR="$DATA_PATH/autoinstall"
|
WH_AUTOINSTALL_DIR="$DATA_PATH/autoinstall"
|
||||||
WH_MANUALINSTALL_DIR="$DATA_PATH/manualinstall"
|
WH_MANUALINSTALL_DIR="$DATA_PATH/manualinstall"
|
||||||
|
WH_TESTINSTALL_DIR="$DATA_PATH/testinstall"
|
||||||
WH_WINETRICKS="$DATA_PATH/winetricks_$WINETRICKS_VERSION"
|
WH_WINETRICKS="$DATA_PATH/winetricks_$WINETRICKS_VERSION"
|
||||||
|
|
||||||
WH_MENU_DIR="$HOME/.local/share/applications/WineHelper"
|
WH_MENU_DIR="$HOME/.local/share/applications/WineHelper"
|
||||||
@ -240,11 +241,11 @@ unpack () {
|
|||||||
print_info "Запуск распаковки архива $1"
|
print_info "Запуск распаковки архива $1"
|
||||||
local command outarg
|
local command outarg
|
||||||
case $1 in
|
case $1 in
|
||||||
*.tar.xz) command="tar -Jxhf" ; outarg="-C " ;;
|
*.tar.xz) command="tar -Jxhf" ; outarg="-C " ;;
|
||||||
*.tar.gz) command="tar -xhzf" ; outarg="-C " ;;
|
*.tar.gz) command="tar -xhzf" ; outarg="-C " ;;
|
||||||
*.tar.zst) command="tar -I zstd -xhf" ; outarg="-C " ;;
|
*.tar.zst) command="tar -I zstd -xhf" ; outarg="-C " ;;
|
||||||
*.tar) command="tar -xhf" ; outarg="-C " ;;
|
*.tar) command="tar -xhf" ; outarg="-C " ;;
|
||||||
*.zip|*.exe) command="7z x -y" ; outarg="-o" ;;
|
*.zip|*.exe|*.rar) command="7z x -y" ; outarg="-o" ;;
|
||||||
esac
|
esac
|
||||||
create_new_dir "$2"
|
create_new_dir "$2"
|
||||||
if $command "$1" ${outarg}"$2" ; then
|
if $command "$1" ${outarg}"$2" ; then
|
||||||
@ -255,6 +256,32 @@ unpack () {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try_get_page () {
|
||||||
|
local url_page="$1"
|
||||||
|
export OUT_PAGE_TMP="${WH_TMP_DIR}/url_page.tmp"
|
||||||
|
print_info "Чтение страницы: $url_page"
|
||||||
|
if ! curl -o "$OUT_PAGE_TMP" -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$url_page" \
|
||||||
|
|| grep -q "Forbidden" "$OUT_PAGE_TMP"
|
||||||
|
then
|
||||||
|
try_remove_file "$OUT_PAGE_TMP"
|
||||||
|
fatal "Страница сайта $1 не доступна, или превышено количество запросов к странице."
|
||||||
|
else
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
read_page () {
|
||||||
|
if [[ -n $OUT_PAGE_TMP ]] \
|
||||||
|
&& [[ -f "$OUT_PAGE_TMP" ]]
|
||||||
|
then
|
||||||
|
cat "$OUT_PAGE_TMP"
|
||||||
|
try_remove_file "$OUT_PAGE_TMP"
|
||||||
|
unset OUT_PAGE_TMP
|
||||||
|
else
|
||||||
|
echo "Исользуй try_get_page перед read_page"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
try_download () {
|
try_download () {
|
||||||
local DOWNLOAD_FILE_URL="${1// /%20}"
|
local DOWNLOAD_FILE_URL="${1// /%20}"
|
||||||
local OUTPUT_FILE="$2"
|
local OUTPUT_FILE="$2"
|
||||||
@ -1208,6 +1235,11 @@ run_autoinstall () {
|
|||||||
elif [[ -f "$WH_MANUALINSTALL_DIR/$INSTALL_SCRIPT_NAME" ]] ; then
|
elif [[ -f "$WH_MANUALINSTALL_DIR/$INSTALL_SCRIPT_NAME" ]] ; then
|
||||||
INSTALL_SCRIPT="$WH_MANUALINSTALL_DIR/$INSTALL_SCRIPT_NAME"
|
INSTALL_SCRIPT="$WH_MANUALINSTALL_DIR/$INSTALL_SCRIPT_NAME"
|
||||||
WH_INSTALL_MODE="manual"
|
WH_INSTALL_MODE="manual"
|
||||||
|
elif [[ -d "$WH_TESTINSTALL_DIR" ]] \
|
||||||
|
&& [[ -f "$WH_TESTINSTALL_DIR/$INSTALL_SCRIPT_NAME" ]]
|
||||||
|
then
|
||||||
|
INSTALL_SCRIPT="$WH_TESTINSTALL_DIR/$INSTALL_SCRIPT_NAME"
|
||||||
|
WH_INSTALL_MODE="test"
|
||||||
else
|
else
|
||||||
INSTALL_SCRIPT="0"
|
INSTALL_SCRIPT="0"
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user