Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d117901d1 | ||
|
|
918e6142d5 | ||
|
|
2a5796e542 | ||
|
|
b1d0737f54 | ||
|
|
ed1fd3319a | ||
|
|
10421a8fcb | ||
|
|
9cec5328d6 | ||
|
|
1258dc32c6 | ||
|
|
30379cd66a | ||
|
|
73de218445 | ||
|
|
7c544b48da | ||
|
|
23e84a378c | ||
|
|
142e565637 | ||
|
|
ec66229043 | ||
|
|
9572b91dde | ||
|
|
5cab2bf142 | ||
|
|
d0947318a3 | ||
|
|
5e49cefed5 | ||
|
|
d0f6b59f51 | ||
|
|
8c523f316f | ||
|
|
9138f09772 | ||
|
|
69f38db20c | ||
|
|
51a3fa452b | ||
|
|
f1837ca9b3 | ||
|
|
4b6fab878f | ||
|
|
2121a110ed | ||
|
|
2fe7a31b54 | ||
|
|
32070ec065 | ||
|
|
5e4f63c50b | ||
|
|
10ca3b3c98 | ||
|
|
0475c7e058 | ||
|
|
b146b01a82 | ||
|
|
41232f2315 | ||
|
|
73696de876 | ||
|
|
3cbdef4f00 | ||
|
|
4b0fea887b | ||
|
|
4d77861863 | ||
|
|
2854f8751b | ||
|
|
53a09b13d7 | ||
|
|
0df709380c | ||
|
|
e49a267d4c | ||
|
|
9724b75fc2 | ||
|
|
436e250932 | ||
|
|
6160eef77b | ||
|
|
26a92bea4d | ||
|
|
de57b947bf | ||
|
|
e43678193a | ||
|
|
032c03fbb1 | ||
|
|
8d82125e74 | ||
|
|
f067412a29 | ||
|
|
d9ffca88d1 | ||
|
|
7d925bdd15 | ||
|
|
bcf53c361c | ||
|
|
5b38f2c10d | ||
|
|
aec21eda1e | ||
|
|
f8ce14d725 | ||
|
|
ce1fb05fc7 | ||
|
|
659b0b1f5b | ||
|
|
3732f71b7b | ||
|
|
d4f2d367b5 | ||
|
|
a75e6c4f83 | ||
|
|
fd2759f52b | ||
|
|
06f3cbaf68 | ||
|
|
cf375cc5c4 | ||
|
|
681d80f0d8 |
No files matched your search
@@ -0,0 +1,43 @@
|
||||
#!/usr/bin/env bash
|
||||
# info_ru: “КСАМУ” - Комплексная система автоматизации медицинского учреждения.
|
||||
########################################################################
|
||||
export PROG_URL="https://docs.medicine-it.ru/"
|
||||
export WH_WINE_USE="wine-10.18.1-alt1-wow64"
|
||||
export WINEPREFIX="ksamu"
|
||||
export PROG_NAME="КСАМУ"
|
||||
export PROG_ICON="ksamu"
|
||||
export BASE_PFX="ksamu_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export INSTALL_DLL="corefonts tahoma richtx32 riched20 riched30 msls31 msftedit msxml6 msxml4 msxml3 fontsmooth=gray"
|
||||
# riched32
|
||||
export WH_WINDOWS_VER="7"
|
||||
export WH_USE_CPCSP_PROXY="1"
|
||||
export WH_MAIN_DECORATED="1"
|
||||
export WH_VIRTUAL_DESKTOP="0"
|
||||
export FREETYPE_PROPERTIES="truetype:interpreter-version=35"
|
||||
|
||||
prepair_wine
|
||||
create_desktop "$PROG_NAME" "$DRIVE_C/KSAMU/KSAMU.exe" "$PROG_ICON"
|
||||
|
||||
echo '
|
||||
# хак для исправления открытия выбора файла сертификата в фоне
|
||||
if ! command -v wmctrl &>/dev/null ; then
|
||||
wmctrl_not_found="Для продолжения работы установите wmctrl:\n\nsu -\napt-get update\napt-get install wmctrl\nexit"
|
||||
zenity --error --title="Ошибка" --text="$wmctrl_not_found" --ok-label="Выход"
|
||||
fatal "$wmctrl_not_found"
|
||||
fi
|
||||
|
||||
background_task() {
|
||||
while true; do
|
||||
sleep 1
|
||||
OPEN_WIN_ID=$(wmctrl -xl | grep -i "ksamu" | grep -i "открыть" | cut -d" " -f1)
|
||||
if [[ -n $OPEN_WIN_ID ]] ; then
|
||||
wmctrl -i -r $OPEN_WIN_ID -b add,above
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
background_task &
|
||||
WH_BG_PID=$!
|
||||
export WH_BG_PID
|
||||
' >> "$DRIVE_C/KSAMU/KSAMU.exe.whdb"
|
||||
@@ -16,11 +16,11 @@ prepair_wine
|
||||
# фикс постоянного запроса обновления Windows
|
||||
get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
|
||||
|
||||
AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cl.exe"
|
||||
AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cl"
|
||||
AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cl/setup.exe"
|
||||
AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_ct.exe"
|
||||
AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_ct"
|
||||
AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_ct/setup.exe"
|
||||
|
||||
if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_cl.exe" "${AUTOINSTALL_EXE}" ; then
|
||||
if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_ct.exe" "${AUTOINSTALL_EXE}" ; then
|
||||
unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
|
||||
try_remove_file "$AUTOINSTALL_EXE"
|
||||
|
||||
|
||||
+16
-10
@@ -7,23 +7,29 @@ if [[ $(id -u) -ne 0 ]] ; then
|
||||
fi
|
||||
|
||||
##### MESSAGES FUNCTIONS #####
|
||||
print_error () { printf "\E[31m%s ВНИМАНИЕ: $@ %s\e[0m\n" ;}
|
||||
fatal () { print_error "$@" ; exit 1 ;}
|
||||
if [[ -t 0 ]] ; then
|
||||
print_error () { printf "\E[31m%s Ошибка: $* %s\e[0m\n" ;}
|
||||
else
|
||||
print_error () { echo -e "Ошибка: $*" ;}
|
||||
fi
|
||||
|
||||
##### UPDATE SYSTEM #####
|
||||
apt-get update || fatal "Не удалось обновить список доступных пакетов,"
|
||||
fatal () {
|
||||
print_error "$@ Аварийное завершение работы WineHelper!"
|
||||
exit 1
|
||||
}
|
||||
|
||||
##### CHECK AREPO (x86_64-i586) #####
|
||||
apt-repo | grep -q "x86_64-i586" || fatal "Репозиторий x86_64-i586 не подключен. \
|
||||
32-битные зависимости не будут установлены, а значит не будут работать и 32-битные \
|
||||
windows приложения. Подробнее по ссылке: https://www.altlinux.org/Biarch"
|
||||
|
||||
##### UPDATE SYSTEM #####
|
||||
apt-get update || fatal "Не удалось обновить список доступных пакетов,"
|
||||
|
||||
##### INSTALL DEPENDENCIES #####
|
||||
# fonts-ttf-ms
|
||||
|
||||
apt-get install {i586-,}{glibc-core,libstdc++6,glibc-pthread,glibc-nss,\
|
||||
libnss-mdns,libunixODBC2,ocl-icd,libfreetype,libfontconfig1,\
|
||||
libgnutls30,libGL,libEGL,xorg-dri-swrast,xorg-dri-intel,xorg-dri-radeon,\
|
||||
libvulkan1,libcups} || fatal "Не удалось установить зависимости."
|
||||
|
||||
apt-get install {i586-,}wine
|
||||
apt-get install i586-{wine,glibc-core,libstdc++6,glibc-pthread,glibc-nss,\
|
||||
libnm,libnss,libnss-mdns,libnsl1,libunwind,libunixODBC2,ocl-icd,libfreetype,\
|
||||
libcups,libfontconfig1,libgnutls30,libGL,libEGL,libvulkan1,xorg-dri-swrast,\
|
||||
xorg-dri-intel,xorg-dri-radeon} || fatal "Не удалось установить зависимости."
|
||||
File renamed without changes.
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
@@ -0,0 +1,38 @@
|
||||
#!/usr/bin/env bash
|
||||
# info_ru: Установщик "ЕМИАС" - Единая медицинская информационно-аналитическая система
|
||||
########################################################################
|
||||
export PROG_URL="https://emias.info/"
|
||||
export WH_WINE_USE="wine-10.18.1-alt1-wow64"
|
||||
export WINEPREFIX="emias"
|
||||
export PROG_NAME="КИС ЕМИАС"
|
||||
export BASE_PFX="emias_pfx_x64_v01"
|
||||
export WINEARCH="win64"
|
||||
export INSTALL_DLL="crypt32"
|
||||
export WH_WINDOWS_VER="7"
|
||||
export WH_USE_CPCSP_PROXY="1"
|
||||
export STAGING_SHARED_MEMORY="1"
|
||||
export WINE_LARGE_ADDRESS_AWARE="1"
|
||||
|
||||
if [[ -f "$2" ]] \
|
||||
&& [[ $(basename "$2") =~ (kis\.exe|kis_z\.exe) ]]
|
||||
then
|
||||
prepair_wine
|
||||
|
||||
KIS_EXE="$2"
|
||||
PROG_PATH="$DRIVE_C/EMIAS"
|
||||
create_new_dir "$PROG_PATH"
|
||||
print_info "Копируем файлы приложениея в каталог $PROG_PATH"
|
||||
cp -fr "$(dirname "$KIS_EXE")"/* "$PROG_PATH/"
|
||||
|
||||
create_desktop "КИС ЕМИАС" "$PROG_PATH/kis.exe" "kis-emias"
|
||||
create_desktop "КИС АДМИН" "$PROG_PATH/kis_z.exe" "kis-emias"
|
||||
|
||||
if [[ $3 == "--config" ]] ; then
|
||||
KIS_INI="$PROG_PATH/kis.ini"
|
||||
print_info "Открываем файл для редактирования: $KIS_INI"
|
||||
xdg-open "$KIS_INI"
|
||||
fi
|
||||
else
|
||||
fatal "Не найден файл kis.exe. Перезапустите по примеру:
|
||||
winehelper install $1 \"/путь/до/kis.exe\""
|
||||
fi
|
||||
+25
-3
@@ -1,6 +1,7 @@
|
||||
##### WINE WOW64 #####
|
||||
e9a8b79dfe12cad1304dca573d73aefe109e3d69b6fff739c8dbb8b2d3c271c6 wine-10.12.1-alt1-wow64.tar.xz
|
||||
a862761c432f8619caf8100589678a1cbb523787259120ccd4388089d81e3b17 wine-10.18.1-tflex-alt2-wow64.tar.xz
|
||||
349c707148a23e667970309248bbbf97b4e2a0db59c548e73d9fe9c3f585872c wine-10.18.1-alt1-wow64.tar.xz
|
||||
|
||||
##### WINE AMD64 #####
|
||||
009c95bfe2df3f9264c9c5092f3e30ea7a168dd7869046058a718a70739602d4 wine_wh_tflex_10-9_amd64.tar.xz
|
||||
@@ -114,6 +115,7 @@ edf16d2b37bc77d121d5d81b06b60d3f694e0060c6606e729ceab30de3d27466 vkd3d-proton-s
|
||||
##### CPCSP_PROXY #####
|
||||
3153088ff28d6af415c3504a421e5382554dbb305f38d5a87dd84df90d680421 wine-cpcsp_proxy-0.6.1-alt1.tar.xz
|
||||
fbe72bfe3c2c307363782ce2d37589e142b44111f269657b0e516a6b2d6ab8a9 wine-cpcsp_proxy-0.7.3-alt5-wow64.tar.xz
|
||||
6f43427148c6f424cd49a406328669e4ec4f21df7bc86f1a6aad2b5c16b50e39 wine-cpcsp_proxy-0.7.7-alt1-wow64.tar.xz
|
||||
|
||||
##### FONTS #####
|
||||
405bfe3b7c7f80034837c05656535053305727ee4bf1d993521b67b71d08ebc6 extra_fonts_v01.tar.xz
|
||||
@@ -188,11 +190,31 @@ ef7e8f1ba785d48e4ea287feed5b79bd630d423e59efadb43da9653adefef218 ais-lpu-client
|
||||
# create with wine_x_tkg_10-0_i586 (universal user: xuser)
|
||||
# winetricks vcrun2005 vcrun2008 dotnet20sp2 dotnet40 mfc42 7zip
|
||||
|
||||
f18864014fdb2fead0b45b5e70e95073072b89168df8cd6debba89081ac51a2a ksamu_pfx_x64_v01.tar.xz
|
||||
# create with wine_x_tkg_10-0_i586 (universal user: xuser)
|
||||
# winetricks msxml6 msxml4 msxml3 riched30 msls31 riched20 msftedit richtx32 fontsmooth=gray
|
||||
70a4cbce1b600434b4d5f241ee90dafb15f7b5f821bc1594e728493febaf017b ksamu_pfx_x64_v03.tar.xz
|
||||
# create with wine-10.18.1-alt1-wow64 (universal user: xuser)
|
||||
# winetricks corefonts tahoma msxml6 msxml4 msxml3 riched30 msls31 riched20 msftedit richtx32 fontsmooth=gray
|
||||
# + manuall installed riched32
|
||||
|
||||
5971788003a5337c23003ad0944c59d549e025c5dc10c19d2e0ec9e7dc04819f ppdgr2_pfx_x64_v01.tar.xz
|
||||
# create with wine-10.18.1-alt1-wow64 (universal user: xuser)
|
||||
# winetricks dotnet48 msxml4 msxml6 corefonts lucida wsh57 vb6run
|
||||
|
||||
60d2e2de1fe44c008ae475b6c81b3ce13da207556a733c5f34225f8ee8df7f9a nalog_pfx_x64_v01.tar.xz
|
||||
# create with wine-10.18.1-alt1-wow64 (universal user: xuser)
|
||||
# winetricks msxml4 msxml6 corefonts wsh57 gdiplus
|
||||
|
||||
04b48931e34c8f221c2487e468771d58200d0e856847f91cb711ed1460b89559 soun_pfx_x64_v01.tar.xz
|
||||
# create with wine-10.18.1-alt1-wow64 (universal user: xuser)
|
||||
# winetricks corefonts ie8
|
||||
|
||||
06bb83c64ef5e749741fb009a12e07ad62865474c5c7db049894c7871a1471cc dialux_pfx_x86_v04.tar.xz
|
||||
# create with wine_x_tkg_10-0_i586 (universal user: xuser)
|
||||
# winetricks mdac27 wsh57 jet40 msxml6 mdac28 gdiplus msxml4 msxml3 vcrun2010 msls31 ie8 dotnet20sp1
|
||||
|
||||
d16c300b5451e4fad6eeebeca0949367a7bdf1cb1878fc51f0f9dee33744d3a7 emias_pfx_x64_v01.tar.xz
|
||||
# create with wine-10.18.1-alt1-wow64 (universal user: xuser)
|
||||
# winetricks crypt32
|
||||
|
||||
##### ADDONS #####
|
||||
# addons with ODBC, SSH, *.reg
|
||||
0f4ef434df07bc338ae308af44330590eaa1d9c94b64850514e55b960642d0eb scadoffice_addons_v02.tar.xz
|
||||
@@ -1,15 +1,16 @@
|
||||
#!/usr/bin/env bash
|
||||
# info_ru: Программа «Декларация 2024» позволяет автоматически формировать налоговые декларации по форме 3-НДФЛ. В процессе заполнения Вами данных программа автоматически проверяет их корректность, что уменьшает вероятность появления ошибки.
|
||||
# info_ru: Программа «Декларация» позволяет автоматически формировать налоговые декларации по форме 3-НДФЛ. В процессе заполнения Вами данных программа автоматически проверяет их корректность, что уменьшает вероятность появления ошибки.
|
||||
########################################################################
|
||||
export PROG_URL="https://www.nalog.gov.ru"
|
||||
export WH_WINE_USE="wine_x_tkg_10-0_amd64"
|
||||
export WH_WINE_USE="wine-10.18.1-alt1-wow64"
|
||||
export WINEPREFIX="declaration"
|
||||
export PROG_NAME="Декларация"
|
||||
export PROG_ICON="declarac"
|
||||
export BASE_PFX="defpfx_x86_v01"
|
||||
export WINEARCH="win32"
|
||||
export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
|
||||
export PROG_ICON="declarac-2"
|
||||
export BASE_PFX="none"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WH_USE_EXTRA_FONTS="1"
|
||||
export INSTALL_DLL="renderer=no3d"
|
||||
|
||||
try_get_page "https://www.nalog.gov.ru/rn77/program/5961249/"
|
||||
VER_YEAR=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF-2)}' | head -n 1)
|
||||
@@ -23,7 +24,7 @@ if try_download "https://data.nalog.ru/files/${VER_YEAR}/${VER_MSI_SLASH}/${VER_
|
||||
wine_run_install "${AUTOINSTALL_MSI}" /q
|
||||
try_remove_file "${AUTOINSTALL_MSI}"
|
||||
|
||||
WIN_FILE_EXEC="$DRIVE_C/АО ГНИВЦ/Декларация ${YEAR}/Decl${YEAR}.exe"
|
||||
WIN_FILE_EXEC="$DRIVE_C/АО ГНИВЦ/Декларация-2 ${YEAR}/Declaration${YEAR}.exe"
|
||||
create_desktop "$PROG_NAME $YEAR" "$WIN_FILE_EXEC" "$PROG_ICON"
|
||||
|
||||
# Удаляем ярлык предыдущей версии
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
#!/usr/bin/env bash
|
||||
# info_ru: Программное обеспечение для 3D-графики, предназначенное для проектирования освещения. (Версия 4.4.0.2)
|
||||
########################################################################
|
||||
export WH_WINE_USE="wine_x_tkg_10-0_i586"
|
||||
export WINEPREFIX="dialux"
|
||||
export PROG_NAME="DIALux"
|
||||
export PROG_ICON="dialux"
|
||||
export BASE_PFX="dialux_pfx_x86_v04"
|
||||
export WH_WINDOWS_VER="xp"
|
||||
export WINEARCH="win32"
|
||||
export INSTALL_DLL="mdac28 jet40 vcrun2010 gdiplus dotnet20sp1 msxml3 msxml4 msxml6 ie8"
|
||||
|
||||
prepair_wine
|
||||
|
||||
WIN_FILE_EXEC="$DRIVE_C/Program Files/DIALux/DIALux.exe"
|
||||
create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
|
||||
@@ -1,18 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# info_ru: “КСАМУ” - Комплексная система автоматизации медицинского учреждения.
|
||||
########################################################################
|
||||
export PROG_URL="https://docs.medicine-it.ru/"
|
||||
export WH_WINE_USE="wine-10.12.1-alt1-wow64"
|
||||
export WINEPREFIX="ksamu"
|
||||
export PROG_NAME="КСАМУ"
|
||||
export PROG_ICON="ksamu"
|
||||
export BASE_PFX="ksamu_pfx_x64_v01"
|
||||
export WINEARCH="win64"
|
||||
export INSTALL_DLL="richtx32 riched20 riched30 msls31 msftedit msxml6 msxml4 msxml3 fontsmooth=gray"
|
||||
# riched32
|
||||
export WH_USE_EXTRA_FONTS="1"
|
||||
export WH_WINDOWS_VER="7"
|
||||
export WH_USE_CPCSP_PROXY="1"
|
||||
|
||||
prepair_wine
|
||||
create_desktop "$PROG_NAME" "$DRIVE_C/KSAMU/KSAMU.exe" "$PROG_ICON"
|
||||
+11
-7
@@ -2,19 +2,20 @@
|
||||
# info_ru: Программа автоматизации процесса подготовки юридическими и физическими лицами документов для представления в налоговые органы в электронной форме и на бумажном носителе.
|
||||
########################################################################
|
||||
export PROG_URL="https://www.nalog.gov.ru"
|
||||
export WH_WINE_USE="wine_x_tkg_10-0_amd64"
|
||||
export WH_WINE_USE="wine-10.18.1-alt1-wow64"
|
||||
export WINEPREFIX="nalog"
|
||||
export PROG_NAME="Налогоплательщик ЮЛ"
|
||||
export PROG_ICON="npul"
|
||||
export BASE_PFX="defpfx_x86_v01"
|
||||
export WINEARCH="win32"
|
||||
export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
|
||||
export BASE_PFX="nalog_pfx_x64_v01"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WH_XDG_OPEN="doc"
|
||||
export INSTALL_DLL="msxml4 msxml6 corefonts wsh57 gdiplus"
|
||||
|
||||
try_get_page "https://data.nalog.ru/rn77/program/5961229/"
|
||||
VER_MSI=$(read_page | grep -oP 'NalogUL\d+\.msi' | tail -1 | grep -oP '\d+')
|
||||
VER_MSI=$(read_page | grep -oP 'NalogUL\d+\.msi' | tail -n 1 | grep -oP '\d+')
|
||||
VER_MSI_URL="${VER_MSI:0:1}.${VER_MSI:1}" # 492 → 4.92
|
||||
VER_EXE=$(read_page | grep -oP 'NalogUL\d+\.exe' | tail -1 | grep -oP '\d+')
|
||||
VER_EXE=$(read_page | grep -oP 'NalogUL\d+\.exe' | tail -n 1 | grep -oP '\d+')
|
||||
VER_EXE_URL="${VER_EXE:0:1}.${VER_EXE:1:2}.${VER_EXE:3}" # 4924 → 4.92.4
|
||||
|
||||
AUTOINSTALL_MSI="${WH_TMP_DIR}/NalogUL${VER_MSI}.msi"
|
||||
@@ -25,7 +26,7 @@ if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_URL}/NalogUL${VER_M
|
||||
wine_run_install "${AUTOINSTALL_MSI}" /quiet INSTALLDIR="c:\npul"
|
||||
try_remove_file "${AUTOINSTALL_MSI}"
|
||||
|
||||
PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "*.msi")"
|
||||
PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "Печать НД с PDF417*.msi")"
|
||||
wine_run_install "${PRINT_INSTALLER}" "/q"
|
||||
|
||||
# Процедуры конвертации, индексация данных. По завершении процедур программа сама закроется. Признаком успешного завершения будет отсутствие в папке с программой файла setupmarker.ini. Если не принять процедуру, .exe файл обновления не установиться.
|
||||
@@ -38,6 +39,9 @@ if [[ -n "$VER_EXE" ]] \
|
||||
then
|
||||
wine_run_install "${AUTOINSTALL_EXE}" "/SILENT"
|
||||
try_remove_file "${AUTOINSTALL_EXE}"
|
||||
|
||||
PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "Печать НД с PDF417*.msi" | tail -n 1)"
|
||||
wine_run_install "${PRINT_INSTALLER}" "/q"
|
||||
else
|
||||
print_info "Дополнительных обновлений не требуется."
|
||||
fi
|
||||
|
||||
+7
-5
@@ -2,21 +2,23 @@
|
||||
# info_ru: Подготовка документов для государственной регистрации (ППДГР)
|
||||
########################################################################
|
||||
export PROG_URL="https://www.nalog.gov.ru"
|
||||
export WH_WINE_USE="wine_x_tkg_10-0_amd64"
|
||||
export WH_WINE_USE="wine-10.18.1-alt1-wow64"
|
||||
export WINEPREFIX="ppdgr2"
|
||||
export PROG_NAME="ППДГР-2"
|
||||
export PROG_ICON="ppdgr"
|
||||
export BASE_PFX="defpfx_dn48_x86_v01"
|
||||
export WINEARCH="win32"
|
||||
export INSTALL_DLL="dotnet48 msxml3 msxml4 msxml6 corefonts lucida wsh57 vcrun6 jet40 gdiplus"
|
||||
export BASE_PFX="ppdgr2_pfx_x64_v01"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
var_winedlloverride_update "msxml4=b,wininet=b"
|
||||
export WH_USE_EXTRA_FONTS="1"
|
||||
export INSTALL_DLL="dotnet48 msxml4 msxml6 corefonts lucida wsh57 vb6run"
|
||||
# var_winedlloverride_update "gdiplus,msxml3,wininet=b;msxml4=n"
|
||||
|
||||
try_get_page "https://www.nalog.gov.ru/rn77/program/5961277/"
|
||||
VER_MSI_SLASH=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF-1)}' | head -n 1)
|
||||
AUTOINSTALL_EXE="${WH_TMP_DIR}/SetupPPDGR2.msi"
|
||||
|
||||
prepair_wine
|
||||
|
||||
if try_download "https://data.nalog.ru/files/ppdgr/${VER_MSI_SLASH}/SetupPPDGR2.msi" "${AUTOINSTALL_EXE}" ; then
|
||||
wine_run_install "${AUTOINSTALL_EXE}" /q
|
||||
try_remove_file "${AUTOINSTALL_EXE}"
|
||||
|
||||
+9
-6
@@ -2,22 +2,25 @@
|
||||
# info_ru: Справочник кодов обозначения налоговых органов для целей учета налогоплательщиков
|
||||
########################################################################
|
||||
export PROG_URL="https://www.nalog.gov.ru"
|
||||
export WH_WINE_USE="wine_x_tkg_10-0_amd64"
|
||||
export WH_WINE_USE="wine-10.18.1-alt1-wow64"
|
||||
export WINEPREFIX="soun"
|
||||
export PROG_NAME="СОУН"
|
||||
export PROG_ICON="soun"
|
||||
export BASE_PFX="defpfx_x86_v01"
|
||||
export WINEARCH="win32"
|
||||
export INSTALL_DLL=""
|
||||
export WH_WINDOWS_VER="10"
|
||||
export BASE_PFX="soun_pfx_x64_v01"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="7"
|
||||
export WH_USE_EXTRA_FONTS="1"
|
||||
export INSTALL_DLL="corefonts ie8"
|
||||
export FREETYPE_PROPERTIES="truetype:interpreter-version=35"
|
||||
|
||||
try_get_page "https://www.nalog.gov.ru/rn77/program/5961268/"
|
||||
VER_MSI_SLASH=$(read_page | grep -oP 'href="\K[^"]*.exe[^"]*' | awk -F'/' '{print $(NF-1)}' | head -n 1)
|
||||
AUTOINSTALL_EXE="${WH_TMP_DIR}/soun_ins.exe"
|
||||
|
||||
prepair_wine
|
||||
if try_download "https://data.nalog.ru/files/Soun/${VER_MSI_SLASH}/soun_ins.exe" "${AUTOINSTALL_EXE}" ; then
|
||||
|
||||
if try_download "https://data.nalog.ru/files/Soun/${VER_MSI_SLASH}/soun_ins.exe" "${AUTOINSTALL_EXE}"
|
||||
then
|
||||
# TODO: Тихий режим или предупреждение
|
||||
wine_run_install "${AUTOINSTALL_EXE}"
|
||||
try_remove_file "${AUTOINSTALL_EXE}"
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -2,13 +2,13 @@
|
||||
# info_ru: Программа проверки файлов на соответствие форматам представления в электронном виде налоговых деклараций, бухгалтерской отчетности.
|
||||
########################################################################
|
||||
export PROG_URL="https://www.nalog.gov.ru"
|
||||
export WH_WINE_USE="wine_x_tkg_10-0_amd64"
|
||||
export WH_WINE_USE="wine-10.18.1-alt1-wow64"
|
||||
export WINEPREFIX="nalog"
|
||||
export PROG_NAME="Тестер"
|
||||
export PROG_ICON="tester"
|
||||
export BASE_PFX="defpfx_x86_v01"
|
||||
export WINEARCH="win32"
|
||||
export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
|
||||
export BASE_PFX="nalog_pfx_x64_v01"
|
||||
export WINEARCH="win64"
|
||||
export INSTALL_DLL="msxml4 msxml6 corefonts wsh57 gdiplus"
|
||||
export WH_WINDOWS_VER="10"
|
||||
|
||||
try_get_page "https://www.nalog.gov.ru/rn77/program/5961279/"
|
||||
|
||||
+178
-129
@@ -40,7 +40,6 @@ else
|
||||
WH_WINETRICKS="/usr/bin/winetricks"
|
||||
WH_DEVEL="1"
|
||||
|
||||
|
||||
# минимальная проверка синтаксиса скриптов
|
||||
for self_check_script in "$RUN_SCRIPT" \
|
||||
"$DATA_PATH/dependencies.sh" "$DATA_PATH/autoinstall"/* \
|
||||
@@ -101,7 +100,7 @@ if [[ "$1" == "--debug" ]] ; then
|
||||
export DXVK_NVAPI_LOG_LEVEL="error"
|
||||
shift
|
||||
else
|
||||
check_variables WINEDEBUG "-all,err+all"
|
||||
check_variables WINEDEBUG "-all"
|
||||
check_variables DXVK_LOG_LEVEL "none"
|
||||
check_variables VKD3D_SHADER_DEBUG "none"
|
||||
check_variables VKD3D_DEBUG "none"
|
||||
@@ -139,14 +138,17 @@ check_variables WINEFSYNC "0"
|
||||
|
||||
check_variables WINEUSERNAME "xuser"
|
||||
check_variables WINEARCH "win64" # or "win32"
|
||||
check_variables WH_WINE_USE "wine_x_tkg_10-0_amd64" # or system
|
||||
check_variables WH_WINE_USE "wine-10.18.1-alt1-wow64" # 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.3-alt5-wow64"
|
||||
check_variables CPCSP_PROXY_WOW64_VER "0.7.7-alt1-wow64"
|
||||
|
||||
check_variables WH_USE_EXTRA_FONTS "0"
|
||||
check_variables EXTRA_FONTS_VER "01"
|
||||
check_variables WH_FONT_MSS_REPLACE "0"
|
||||
check_variables WH_FONT_SMOOTHING "0"
|
||||
# check_variables FREETYPE_PROPERTIES "truetype:interpreter-version=35"
|
||||
|
||||
check_variables STAGING_SHARED_MEMORY "1"
|
||||
check_variables WINE_LARGE_ADDRESS_AWARE "1"
|
||||
@@ -162,6 +164,9 @@ check_variables WH_USE_SHADER_CACHE "1"
|
||||
check_variables WH_USE_MESA_GL_OVERRIDE "0"
|
||||
check_variables WH_USE_WINE_DXGI "0"
|
||||
check_variables WH_DLL_INSTALL ""
|
||||
check_variables WH_MAIN_DECORATED "default"
|
||||
check_variables WH_MC_DECORATED "default"
|
||||
check_variables WH_VIRTUAL_DESKTOP "default"
|
||||
|
||||
check_variables WINE_WIN_START "start /wait /high /unix"
|
||||
|
||||
@@ -202,17 +207,29 @@ su_run () {
|
||||
}
|
||||
|
||||
##### CHECK DEPENDENCIES #####
|
||||
# fonts-ttf-ms
|
||||
|
||||
if ! rpm -q {i586-,}{wine,glibc-core,libstdc++6,glibc-pthread,glibc-nss,\
|
||||
libnss-mdns,libunixODBC2,ocl-icd,libfreetype,libfontconfig1,libgnutls30,libGL,\
|
||||
libEGL,xorg-dri-swrast,xorg-dri-intel,xorg-dri-radeon,libvulkan1,libcups} 1>/dev/null
|
||||
then
|
||||
if su_run "$DATA_PATH/dependencies.sh"
|
||||
then print_info "Зависимости успешно установлены. Продолжаем работу $SCRIPT_NAME"
|
||||
else fatal "Не удалось установить зависимости. Работа $SCRIPT_NAME прервана."
|
||||
check_deps_i586 () {
|
||||
if [[ $WH_USE_GUI != "1" ]] && [[ ! -t 0 ]] ; then
|
||||
print_warning "Скрипт запущен из desktop файла."
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $WH_SKIP_DEPS == "1" ]] ; then
|
||||
unset WH_SKIP_DEPS
|
||||
return 0
|
||||
fi
|
||||
|
||||
if ! rpm -q i586-{wine,glibc-core,libstdc++6,glibc-pthread,glibc-nss,\
|
||||
libnm,libnss,libnss-mdns,libnsl1,libunwind,libunixODBC2,ocl-icd,libfreetype,\
|
||||
libcups,libfontconfig1,libgnutls30,libGL,libEGL,libvulkan1,xorg-dri-swrast,\
|
||||
xorg-dri-intel,xorg-dri-radeon} 1>/dev/null
|
||||
then
|
||||
print_warning "Необходимо установить 32-битные зависимости!"
|
||||
if su_run "$DATA_PATH/dependencies.sh"
|
||||
then print_info "Зависимости успешно установлены. Продолжаем работу $SCRIPT_NAME"
|
||||
else fatal "Не удалось установить зависимости. Работа $SCRIPT_NAME прервана."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
##### HELPER FUNCTIONS #####
|
||||
add_to_var () {
|
||||
@@ -714,8 +731,10 @@ EOF
|
||||
} > "$exe_file".whdb
|
||||
|
||||
grep -e "info_" -e "#####" -e "PROG_URL=" -e "WINEPREFIX=" -e "INSTALL_DLL=" \
|
||||
-e "PROG_NAME=" -e "PROG_ICON=" -e "var_" "$INSTALL_SCRIPT" \
|
||||
| awk '{$1=$1;print}' >> "$exe_file".whdb
|
||||
-e "PROG_NAME=" -e "PROG_ICON=" -e "var_" -e "WH_MAIN_DECORATED" \
|
||||
-e "WH_VIRTUAL_DESKTOP" -e "WINE_TOP_WINDOW" -e "WH_FONT_SMOOTHING "\
|
||||
-e "WH_FONT_MSS_REPLACE" -e "FREETYPE_PROPERTIES" \
|
||||
"$INSTALL_SCRIPT" | awk '{$1=$1;print}' >> "$exe_file".whdb
|
||||
|
||||
print_info "Создан файл настроек для $exe_file"
|
||||
fi
|
||||
@@ -773,13 +792,6 @@ check_installed_programs () {
|
||||
[[ -n $2 ]] && fatal "Не найден файл запуска для $2"
|
||||
}
|
||||
|
||||
run_installed_programs () {
|
||||
if check_installed_programs check_only "$1" ; then
|
||||
/usr/bin/env bash -c "\"$RUN_SCRIPT\" \"$EXE_PATH\"" &
|
||||
exit 0
|
||||
fi
|
||||
}
|
||||
|
||||
copy_wined3d () {
|
||||
for wined3dfiles in $1 ; do
|
||||
try_copy_wine_dll_to_pfx_64 "$wined3dfiles.dll"
|
||||
@@ -871,19 +883,26 @@ init_wine_ver () {
|
||||
try_download cloud "$download_url" "$wine_package" "check256sum"
|
||||
unpack "$wine_package" "$WH_DIST_DIR/"
|
||||
try_remove_file "$wine_package"
|
||||
|
||||
# Управление структурой подкаталога Proton "files", перемещая содержимое вверх
|
||||
if [[ -d "$WINEDIR/files" ]]; then
|
||||
print_info "Обнаружена структура каталогов Proton, исправляем пути..."
|
||||
mv "$WINEDIR"/files/* "$WINEDIR/"
|
||||
rmdir "$WINEDIR/files"
|
||||
fi
|
||||
fi
|
||||
|
||||
[[ ! -f "$WINEDIR/version" ]] && echo "$WH_WINE_USE" > "$WINEDIR/version"
|
||||
if [[ $WH_WINE_USE =~ wow64 ]]
|
||||
then export WH_WINE_WOW64="1"
|
||||
else export WH_WINE_WOW64="0"
|
||||
# Управление структурой подкаталога Proton "files", перемещая содержимое вверх
|
||||
if [[ ${WINEDIR,,} =~ proton ]] \
|
||||
&& [[ -d "$WINEDIR/files" ]]
|
||||
then
|
||||
print_info "Обнаружена структура каталогов Proton, исправляем пути..."
|
||||
mv "$WINEDIR"/files/* "$WINEDIR/"
|
||||
try_remove_dir "$WINEDIR/files"
|
||||
fi
|
||||
|
||||
if [[ ! -f "$WINEDIR/version" ]] ; then
|
||||
echo "$WH_WINE_USE" > "$WINEDIR/version"
|
||||
fi
|
||||
|
||||
if [[ $WH_WINE_USE =~ wow64 ]] ; then
|
||||
export WH_WINE_WOW64="1"
|
||||
else
|
||||
export WH_WINE_WOW64="0"
|
||||
check_deps_i586
|
||||
fi
|
||||
|
||||
export WINE="$WINEDIR/bin/wine"
|
||||
@@ -1131,37 +1150,70 @@ check_prefix_var () {
|
||||
init_wineprefix () {
|
||||
check_prefix_var
|
||||
|
||||
if [[ "$WINEARCH" == "win32" ]]
|
||||
then check_variables BASE_PFX "defpfx_x86_v01"
|
||||
else check_variables BASE_PFX "defpfx_x64_v01"
|
||||
fi
|
||||
check_variables BASE_PFX "none"
|
||||
|
||||
export DRIVE_C="$WINEPREFIX/drive_c"
|
||||
export XUSER_PATH="$DRIVE_C/users/xuser"
|
||||
|
||||
if [[ -d "$XUSER_PATH" ]] \
|
||||
&& [[ ! -d "$DRIVE_C/users/$USER" ]]
|
||||
then try_force_link_dir "$XUSER_PATH" "$DRIVE_C/users/$USER"
|
||||
fi
|
||||
|
||||
if [[ ! -f "$WINEPREFIX/.firstboot" ]] ; then
|
||||
if [[ ! -d "$WINEPREFIX" ]] ; then
|
||||
create_new_dir "$WINEPREFIX"
|
||||
if [[ "$CLEAR_PREFIX" == "1" ]]
|
||||
then print_warning "Используется переменная \"CLEAR_PREFIX=1\", которая принудительно создает чистый префикс с установкой компонентов с помощью winetricks."
|
||||
elif [[ "$BASE_PFX" != "none" ]]
|
||||
then get_base_pfx "$BASE_PFX"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ! -d "$WINEPREFIX/drive_c/windows" ]] ; then
|
||||
print_info "Создание префикса $WINEPREFIX."
|
||||
"$WINELOADER" wineboot -i
|
||||
wait_wineserver
|
||||
elif [[ ! -f "$WINEPREFIX/.update-timestamp" ]] \
|
||||
|| [[ ! -d "$WINEPREFIX/drive_c/users" ]]
|
||||
then
|
||||
print_info "Обновление префикса $WINEPREFIX."
|
||||
if [[ -d "$WINEPREFIX/drive_c/windows" ]]
|
||||
then "$WINELOADER" wineboot -u
|
||||
else "$WINELOADER" wineboot -i
|
||||
fi
|
||||
touch "$WINEPREFIX/.firstboot"
|
||||
"$WINELOADER" wineboot -u
|
||||
wait_wineserver
|
||||
fi
|
||||
|
||||
if [[ -d "$XUSER_PATH" ]] && [[ ! -d "$DRIVE_C/users/$USER" ]]
|
||||
then try_force_link_dir "$XUSER_PATH" "$DRIVE_C/users/$USER"
|
||||
elif [[ ! -d "$XUSER_PATH" ]] && [[ -d "$DRIVE_C/users/$USER" ]]
|
||||
then try_force_link_dir "$DRIVE_C/users/$USER" "$XUSER_PATH"
|
||||
fi
|
||||
|
||||
if [[ -L "$XUSER_PATH/Desktop" ]]
|
||||
then rm -f "$XUSER_PATH/Desktop"
|
||||
fi
|
||||
|
||||
create_new_dir "$XUSER_PATH/Desktop"
|
||||
create_new_dir "$XUSER_PATH/AppData/Local/Temp"
|
||||
create_new_dir "$DRIVE_C/ProgramData/Package Cache"
|
||||
create_new_dir "$DRIVE_C/windows/temp"
|
||||
create_new_dir "$DRIVE_C/windows/Installer"
|
||||
|
||||
if [[ ! -d "$WINEPREFIX/dosdevices" ]] ; then
|
||||
create_new_dir "$WINEPREFIX/dosdevices"
|
||||
export REBOOT_PFX="1"
|
||||
fi
|
||||
|
||||
if [[ ! -d "${WINEPREFIX}/dosdevices/c:" ]] ; then
|
||||
try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:"
|
||||
fi
|
||||
if [[ ! -d "${WINEPREFIX}/dosdevices/z:" ]] ; then
|
||||
try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:"
|
||||
fi
|
||||
if [[ ! -d "${WINEPREFIX}/dosdevices/h:" ]] ; then
|
||||
try_force_link_dir "$HOME" "${WINEPREFIX}/dosdevices/h:"
|
||||
fi
|
||||
|
||||
if [[ $REBOOT_PFX == "1" ]] ; then
|
||||
"$WINELOADER" wineboot -r
|
||||
wait_wineserver
|
||||
fi
|
||||
|
||||
if [[ -f "$WINEPREFIX/system.reg" ]] \
|
||||
&& [[ -z $(grep "Windows $WH_WINDOWS_VER" "$WINEPREFIX/system.reg") ]]
|
||||
&& ! grep -iq "Microsoft Windows $WH_WINDOWS_VER" "$WINEPREFIX/system.reg"
|
||||
then
|
||||
if [[ $(echo "$WH_WINDOWS_VER" | sed 's/.*/\L&/') == "xp" ]] \
|
||||
&& [[ "$WINEARCH" != "win32" ]]
|
||||
@@ -1172,33 +1224,11 @@ init_wineprefix () {
|
||||
print_info "Windows версия изменена на win${WH_WINDOWS_VER}"
|
||||
fi
|
||||
|
||||
if [[ -d "$XUSER_PATH" ]] && [[ ! -d "$DRIVE_C/users/$USER" ]]
|
||||
then try_force_link_dir "$XUSER_PATH" "$DRIVE_C/users/$USER"
|
||||
elif [[ ! -d "$XUSER_PATH" ]] && [[ -d "$DRIVE_C/users/$USER" ]]
|
||||
then try_force_link_dir "$DRIVE_C/users/$USER" "$XUSER_PATH"
|
||||
fi
|
||||
|
||||
if [[ ! -f "$WINEPREFIX/.update-timestamp" ]] ; then
|
||||
print_info "Обновление префикса $WINEPREFIX."
|
||||
"$WINELOADER" wineboot -u
|
||||
wait_wineserver
|
||||
fi
|
||||
|
||||
if [[ -L "$XUSER_PATH/Desktop" ]]
|
||||
then rm -f "$XUSER_PATH/Desktop"
|
||||
fi
|
||||
create_new_dir "$XUSER_PATH/Desktop"
|
||||
|
||||
if [[ ! -L "$WINEPREFIX/dosdevices/h:" ]]
|
||||
then try_force_link_dir "$HOME" "$WINEPREFIX/dosdevices/h:"
|
||||
fi
|
||||
|
||||
if [[ $WH_USE_MESA_GL_OVERRIDE == "1" ]] \
|
||||
&& ! lspci | grep -i nvidia > /dev/null
|
||||
then
|
||||
export MESA_GL_VERSION_OVERRIDE="3.3"
|
||||
export MESA_GLSL_VERSION_OVERRIDE="330"
|
||||
|
||||
fi
|
||||
|
||||
if check_wayland_session ; then
|
||||
@@ -1211,13 +1241,6 @@ init_wineprefix () {
|
||||
unset WINE_WAYLAND_HACKS
|
||||
get_and_set_reg_file --delete 'Software\Wine\Drivers' 'Graphics'
|
||||
fi
|
||||
|
||||
# исправляем некорректное отображение выпадающих окон под wayland
|
||||
if [[ $DXVK_VER == "none" ]] \
|
||||
|| [[ $VKD3D_VER == "none" ]]
|
||||
then
|
||||
check_variables WINE_D3D_CONFIG "renderer=vulkan"
|
||||
fi
|
||||
fi
|
||||
|
||||
# хак для XRDP сессии
|
||||
@@ -1230,20 +1253,43 @@ init_wineprefix () {
|
||||
get_and_set_reg_file --delete 'Software\Wine\X11 Driver' 'UseXVidMode'
|
||||
fi
|
||||
|
||||
if [[ $WH_MC_NO_DECORATED = "1" ]] ; then
|
||||
# отключаем декоратор для maincontroller.exe
|
||||
# заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0009-wine.inf.in-disable-decorated-window-for-maincontrol.patch;h=887a5e90e130cddeefdead831ef7a78a32588f11;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4
|
||||
get_and_set_reg_file --add 'Software\Wine\AppDefaults\maincontroller.exe\X11 Driver' 'Decorated' 'REG_SZ' "N" "user"
|
||||
# включаем виртуальный рабочий стол при необходимости
|
||||
if [[ $WH_VIRTUAL_DESKTOP == "1" ]] ; then
|
||||
get_and_set_reg_file --add 'Software\Wine\Explorer' 'Desktop' 'REG_SZ' "Default" "user"
|
||||
WH_SCREEN_RESOLUTION="$(xrandr | sed -rn 's/^.*primary.* ([0-9]+x[0-9]+).*$/\1/p')"
|
||||
[[ $WH_SCREEN_RESOLUTION != *x* ]] && WH_SCREEN_RESOLUTION="1920x1080"
|
||||
get_and_set_reg_file --add 'Software\Wine\Explorer\Desktops' 'Default' 'REG_SZ' "$WH_SCREEN_RESOLUTION" "user"
|
||||
elif [[ $WH_VIRTUAL_DESKTOP == *x* ]] ; then
|
||||
get_and_set_reg_file --add 'Software\Wine\Explorer' 'Desktop' 'REG_SZ' "Default" "user"
|
||||
get_and_set_reg_file --add 'Software\Wine\Explorer\Desktops' 'Default' 'REG_SZ' "$WH_VIRTUAL_DESKTOP" "user"
|
||||
elif [[ $WH_VIRTUAL_DESKTOP == "0" ]] ; then
|
||||
get_and_set_reg_file --delete 'Software\Wine\Explorer\Desktops' 'Default'
|
||||
get_and_set_reg_file --delete 'Software\Wine\Explorer' 'Desktop'
|
||||
fi
|
||||
|
||||
# управляем декоратором для ПО по умолчанию
|
||||
if [[ $WH_MAIN_DECORATED = "0" ]] ; then
|
||||
get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'Decorated' 'REG_SZ' "N" "user"
|
||||
elif [[ $WH_MAIN_DECORATED = "1" ]] ; then
|
||||
get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'Decorated' 'REG_SZ' "Y" "user"
|
||||
fi
|
||||
|
||||
# управляем декоратором для maincontroller.exe
|
||||
if [[ $WH_MC_DECORATED = "0" ]] ; then
|
||||
# заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0009-wine.inf.in-disable-decorated-window-for-maincontrol.patch;h=887a5e90e130cddeefdead831ef7a78a32588f11;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4
|
||||
get_and_set_reg_file --add 'Software\Wine\AppDefaults\maincontroller.exe\X11 Driver' 'Decorated' 'REG_SZ' "N" "user"
|
||||
elif [[ $WH_MC_DECORATED = "1" ]] ; then
|
||||
get_and_set_reg_file --add 'Software\Wine\AppDefaults\maincontroller.exe\X11 Driver' 'Decorated' 'REG_SZ' "Y" "user"
|
||||
fi
|
||||
|
||||
# заменям шрифт Microsoft Sans Serif на Tahoma
|
||||
if [[ $WH_FONT_MSS_REPLACE = "1" ]] ; then
|
||||
# заменям шрифт Microsoft Sans Serif на Tahoma
|
||||
# заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0003-wine.inf-Add-the-font-replacement-for-Microsoft-Sans.patch;h=26b8ae2192d94a2b8ddd8565b90b62a2c2b0ed52;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4
|
||||
get_and_set_reg_file --add 'Software\Wine\Fonts\Replacements' 'Microsoft Sans Serif' 'REG_SZ' "Tahoma" "user"
|
||||
fi
|
||||
|
||||
# добавляем сглаживание шрифтов
|
||||
if [[ $WH_FONT_SMOOTHING = "1" ]] ; then
|
||||
# добавляем сглаживание шрифтов
|
||||
# заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0002-Add-font-smoothing.patch;h=d7c252899499e9ee0e1a93f7c02548cc79025358;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4
|
||||
get_and_set_reg_file --add 'Control Panel\Desktop' 'FontSmoothing' 'REG_SZ' "2" "user"
|
||||
get_and_set_reg_file --add 'Control Panel\Desktop' 'FontSmoothingGamma' 'REG_DWORD' "0x00000578" "user"
|
||||
@@ -1297,28 +1343,9 @@ 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 [[ ! -d "$DRIVE_C/Program Files (x86)/Common Files/Crypto Pro/Shared/" ]]
|
||||
if ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg" \
|
||||
|| [[ $REBOOT_PFX == "1" ]]
|
||||
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
|
||||
fi
|
||||
|
||||
if ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg" ; then
|
||||
print_info "Запускаем настройку cpcsp_proxy..."
|
||||
CPCSP_PROXY_OK="0"
|
||||
|
||||
@@ -1326,11 +1353,15 @@ init_wineprefix () {
|
||||
try_copy_wine_dll_to_pfx_32 "cpcsp_proxy.dll"
|
||||
|
||||
if [[ $WH_WINE_WOW64 == "1" ]] ; then
|
||||
print_info "Запускаем регистрацию 64-битного cpcsp_proxy.dll..."
|
||||
env WINEDEBUG="fixme-all" "$WINE" "C:\\windows\\system32\\regsvr32.exe" \
|
||||
/s /n /i cpcsp_proxy.dll 2>&1 | tee "$WINEPREFIX/cpcsp_setup.log"
|
||||
wait_wineserver
|
||||
|
||||
print_info "Запускаем регистрацию 32-битного cpcsp_proxy.dll..."
|
||||
env WINEDEBUG="fixme-all" "$WINE" "C:\\windows\\syswow64\\regsvr32.exe" \
|
||||
/s /n /i cpcsp_proxy.dll 2>&1 | tee -a "$WINEPREFIX/cpcsp_setup.log"
|
||||
wait_wineserver
|
||||
else
|
||||
try_copy_wine_dll_to_pfx_64 "cpcsp_proxy_setup.exe"
|
||||
try_copy_wine_dll_to_pfx_32 "cpcsp_proxy_setup.exe"
|
||||
@@ -1356,7 +1387,6 @@ init_wineprefix () {
|
||||
fi
|
||||
try_remove_file "$WINEPREFIX/cpcsp_setup.log"
|
||||
|
||||
wait_wineserver
|
||||
if [[ $CPCSP_PROXY_OK == "1" ]]
|
||||
then print_info "Настройка cpcsp_proxy успешно завершена."
|
||||
else fatal "Ошибка во время настройки cpcsp_proxy."
|
||||
@@ -1384,10 +1414,12 @@ init_wineprefix () {
|
||||
for var in WH_WINE_USE BASE_PFX WINEARCH WH_WINDOWS_VER WINEESYNC WINEFSYNC \
|
||||
STAGING_SHARED_MEMORY WINE_LARGE_ADDRESS_AWARE WH_USE_SHADER_CACHE WH_USE_WINE_DXGI \
|
||||
WINE_CPU_TOPOLOGY DXVK_VER VKD3D_VER WH_XDG_OPEN WH_USE_MESA_GL_OVERRIDE \
|
||||
WH_USE_CPCSP_PROXY
|
||||
WH_USE_CPCSP_PROXY WH_USE_EXTRA_FONTS
|
||||
do
|
||||
echo "export $var=\"${!var}\"" >> "$WINEPREFIX/last.conf"
|
||||
done
|
||||
|
||||
unset REBOOT_PFX
|
||||
}
|
||||
|
||||
kill_autostart () {
|
||||
@@ -1510,7 +1542,7 @@ wine_regfile () {
|
||||
wine_run () {
|
||||
local wh_add_args win_file_exec win_file_path win_file_name
|
||||
|
||||
if [[ $1 =~ (winecfg|regedit|winefile|wineconsole) ]] ; then
|
||||
if [[ $1 =~ (winecfg|regedit|winefile|wineconsole|control) ]] ; then
|
||||
win_file_exec="$1"
|
||||
win_file_name="$win_file_exec"
|
||||
win_file_path="$DRIVE_C"
|
||||
@@ -1549,16 +1581,20 @@ wine_run () {
|
||||
create_new_dir "$log_dir"
|
||||
date > "$log_file"
|
||||
|
||||
echo -e "\n##### Версия установленного WineHelper #####" | tee -a "$log_file"
|
||||
rpm -q winehelper | tee -a "$log_file"
|
||||
|
||||
print_warning "Включен режим логирования работы WINE."
|
||||
print_warning "Лог будет сохранен по пути: $log_file"
|
||||
|
||||
echo "##### Основные переменные #####" | tee -a "$log_file"
|
||||
env | grep -e "WH_" -e "WINE" -e "DXVK" -e "VKD3D" | tee -a "$log_file"
|
||||
echo "##### Лог WINE #####" | tee -a "$log_file"
|
||||
echo -e "\n##### Основные переменные #####" | tee -a "$log_file"
|
||||
env | grep -e "WH_" -e "WINE" -e "DXVK" -e "VKD3D" -e "LD_" \
|
||||
| grep -v "ICON" | sort | tee -a "$log_file"
|
||||
|
||||
$MANGOHUD_RUN "$WINELOADER" $wh_add_args "$win_file_exec" "$@" $LAUNCH_PARAMETERS 2>&1 | tee -a "$log_file"
|
||||
echo -e "\n##### Лог WINE #####" | tee -a "$log_file"
|
||||
$MANGOHUD_RUN "$WINELOADER" $wh_add_args "$win_file_exec" "$@" 2>&1 | tee -a "$log_file"
|
||||
else
|
||||
$MANGOHUD_RUN "$WINELOADER" $wh_add_args "$win_file_exec" "$@" $LAUNCH_PARAMETERS
|
||||
$MANGOHUD_RUN "$WINELOADER" $wh_add_args "$win_file_exec" "$@"
|
||||
fi
|
||||
|
||||
wait_wineserver
|
||||
@@ -2050,14 +2086,16 @@ remove_winehelper () {
|
||||
}
|
||||
|
||||
create_base_pfx () {
|
||||
export WINEPREFIX="$1"
|
||||
[[ -n $1 ]] && export WINEPREFIX="$1"
|
||||
check_prefix_var
|
||||
|
||||
local prefix_dir drive_c_dir users_dir archive_path
|
||||
local prefix_dir drive_c_dir users_dir archive_path pfx_arch
|
||||
prefix_dir="$WINEPREFIX"
|
||||
drive_c_dir="$prefix_dir/drive_c"
|
||||
users_dir="$drive_c_dir/users"
|
||||
archive_path="$WH_TMP_DIR/pfx/new_${PREFIX_NAME}.tar.xz"
|
||||
|
||||
[[ $WINEARCH =~ (win64|wow64) ]] && pfx_arch="x64" || pfx_arch="x86"
|
||||
archive_path="$WH_TMP_DIR/pfx/${PREFIX_NAME}_pfx_${pfx_arch}_vNEW.tar.xz"
|
||||
|
||||
# создаем резернвую копию каталога с префиксом
|
||||
try_copy_dir "$prefix_dir" "${prefix_dir}_bak"
|
||||
@@ -2080,8 +2118,6 @@ create_base_pfx () {
|
||||
fi
|
||||
|
||||
# удаляем всё ненужное для переноса префикса
|
||||
try_remove_file "$prefix_dir/.update-timestamp"
|
||||
try_remove_file "$prefix_dir/.firstboot"
|
||||
try_remove_file "$prefix_dir/last.conf"
|
||||
try_remove_dir "$prefix_dir/dosdevices/"
|
||||
try_remove_dir "$users_dir/$USER"
|
||||
@@ -2098,10 +2134,10 @@ create_base_pfx () {
|
||||
|
||||
cd "$prefix_dir"
|
||||
# запускаем сжатие префикса
|
||||
if tar --no-xattrs -c -I 'xz --memlimit=8000MiB -9 -T0' -f "$archive_path" ./* ; then
|
||||
if tar --no-xattrs -c -I 'xz --memlimit=8000MiB -9 -T0' -f "$archive_path" . ; then
|
||||
print_ok "Архив создан по пути: $archive_path"
|
||||
xdg-open "$(dirname "$archive_path")" &
|
||||
cd -
|
||||
exit 0
|
||||
else
|
||||
try_remove_file "$archive_path"
|
||||
cd -
|
||||
@@ -2130,7 +2166,6 @@ backup_prefix() {
|
||||
print_info "Подготовка префикса к упаковке..."
|
||||
if cp -a "$WINEPREFIX" "$temp_prefix_dir" ; then
|
||||
try_remove_dir "$temp_prefix_dir/dosdevices"
|
||||
try_remove_file "$temp_prefix_dir/.update-timestamp"
|
||||
if [[ -d "$temp_users_dir/$USER" ]] \
|
||||
&& [[ ! -L "$temp_users_dir/$USER" ]]
|
||||
then
|
||||
@@ -2401,9 +2436,9 @@ select_component_version() {
|
||||
done
|
||||
}
|
||||
|
||||
run_install_to_prefix() {
|
||||
run_file_in_prefix() {
|
||||
if [[ -z "$1" ]] || [[ -z "$2" ]] || [[ ! -f "$2" ]] ; then
|
||||
fatal "Использование: $SCRIPT_NAME install-to-prefix <имя_префикса> <путь_к_установщику>"
|
||||
fatal "Использование: $SCRIPT_NAME run-in-prefix <имя_префикса> <путь/к/фйалу>"
|
||||
fi
|
||||
|
||||
export WINEPREFIX="$1"
|
||||
@@ -2571,15 +2606,15 @@ case "$arg1" in
|
||||
winereg|regedit) prepair_wine ; wine_run "regedit" ;;
|
||||
winefile|explorer) prepair_wine ; wine_run "winefile" ;;
|
||||
wineconsole|cmd) prepair_wine ; wine_run "wineconsole" ;;
|
||||
control) prepair_wine ; wine_run "control" ;;
|
||||
winetricks) prepair_wine ; "$WH_WINETRICKS" -q "$@" ;;
|
||||
desktop) create_desktop "$@" ; exit 0 ;;
|
||||
install|-i) run_autoinstall "$@" ;;
|
||||
install-to-prefix) run_install_to_prefix "$@" ;;
|
||||
run-in-prefix) run_file_in_prefix "$@" ;;
|
||||
install-dxvk) run_install_dxvk "$@" ;;
|
||||
install-vkd3d) run_install_vkd3d "$@" ;;
|
||||
change-wine) run_change_wine_version "$@" ;;
|
||||
installed) check_installed_programs "$1" ;;
|
||||
run|-r) run_installed_programs "$1" ;;
|
||||
backup-prefix) backup_prefix "$@" ;;
|
||||
restore-prefix) restore_prefix "$@" ;;
|
||||
remove-all) remove_winehelper "$@" ;;
|
||||
@@ -2588,6 +2623,14 @@ case "$arg1" in
|
||||
create-base-pfx) create_base_pfx "$@" ;;
|
||||
init-prefix) prepair_wine ; wait_wineserver ;;
|
||||
clear-winetricks-cache) clear_winetricks_cache "$@" ;;
|
||||
run|-r)
|
||||
if check_installed_programs check_only "$1" ; then
|
||||
WIN_FILE_EXEC="$(readlink -f "$EXE_PATH")"
|
||||
shift
|
||||
prepair_wine
|
||||
wine_run "$WIN_FILE_EXEC" "$@"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
if [[ -f "$arg1" ]] ; then
|
||||
WIN_FILE_EXEC="$(readlink -f "$arg1")"
|
||||
@@ -2598,13 +2641,19 @@ case "$arg1" in
|
||||
if [[ -n "$1" ]] && [[ -f "$1" ]] ; then
|
||||
WIN_OPEN_FILE="$("$WINELOADER" winepath -w "$1")"
|
||||
shift
|
||||
wine_run "$WIN_FILE_EXEC" "$@" "$WIN_OPEN_FILE"
|
||||
else
|
||||
wine_run "$WIN_FILE_EXEC" "$@"
|
||||
fi
|
||||
|
||||
wine_run "$WIN_FILE_EXEC" "$@" "$WIN_OPEN_FILE"
|
||||
else
|
||||
print_error "Команды $arg1 не существует."
|
||||
wh_info
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
;;
|
||||
esac
|
||||
|
||||
if [[ -n "$WH_BG_PID" ]] ; then
|
||||
print_info "Завершение фонового процесса: $WH_BG_PID"
|
||||
kill "$WH_BG_PID" 2>/dev/null
|
||||
fi
|
||||
+2
-2
@@ -1,11 +1,11 @@
|
||||
#!/usr/bin/env xdg-open
|
||||
[Desktop Entry]
|
||||
Name=WineHelper
|
||||
Exec=winehelper gui %F
|
||||
Comment=Launching the graphics interface for Winehelper
|
||||
Comment[ru]=Запуск графического интерфейса WineHelper
|
||||
Type=Application
|
||||
Categories=WineHelper;Utility;Emulator;
|
||||
Categories=WineHelper;Application;Settings
|
||||
StartupNotify=true
|
||||
Icon=winehelper
|
||||
StartupWMClass=winehelper
|
||||
Keywords=wine;windows;
|
||||
+396
-662
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user