Compare commits

..
8 Commits
4 changed files with 12 additions and 8 deletions

No files matched your search

+1 -1
View File
@@ -18,7 +18,7 @@ get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1"
AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cs.exe"
AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cs"
AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/setup.exe"
AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/Setup.exe"
if try_download "https://files.ctm.ru/CSERVICE/SFX/setup_cs.exe" "${AUTOINSTALL_EXE}" ; then
unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
+3 -2
View File
@@ -2,15 +2,16 @@
# info_ru: "КИС Олимп" - программно-аналитический комплекс, состоящий из самостоятельных подключаемых модулей.
########################################################################
export PROG_URL="https://olimp.best/"
export WH_WINE_USE="wine_x_tkg_10-0_i586"
export WH_WINE_USE="wine-10.18.1-alt2-i586"
export WINEPREFIX="olimp"
export PROG_NAME="КИС Олимп"
export BASE_PFX="olimp_pfx_x86_v01"
export BASE_PFX="olimp_pfx_x86_v02"
export WINEARCH="win32"
export WH_WINDOWS_VER="7"
export INSTALL_DLL="jet40 dotnet45 corefonts lucida opensymbol tahoma cjkfonts mdac28 msxml4 native_oleaut32 vcrun2005"
export WINEDLLOVERRIDES="d2d1=n"
export WH_MAIN_DECORATED="0"
export FREETYPE_PROPERTIES="truetype:interpreter-version=35"
if [[ -f "$2" ]] \
&& [[ $(basename "$2") =~ (Loader\.exe) ]]
+3 -2
View File
@@ -12,6 +12,7 @@ f1bf1261550ca2928cefacdb724926d3d6d103433d0ff6882ee9783a50d8f4e4 wine-8.8-stagi
fd209c95a3aa507002374417365b3d1119dbe3a0a6d223034171221a2b187b66 wine-9.0-cx-amd64.tar.xz
##### WINE I586 #####
1385323e059c376299a83088ada85e625c170337ba07e5307df75961726d8eee wine-10.18.1-alt2-i586.tar.xz
3571c40a787f0386e0160b5d471b1bf11fa2a235b497156cd38198b90bcb4a9f wine_x_tkg_10-0_i586.tar.xz
fb7fdfde96de10a1b3b051bdf2727b6a7c1768b878483726454dd6726e9e0193 wine-9.0.14-alt1-i586-spravkibk.tar.xz
6f86d2220b65b709bf88c6f829a4998de3b929cc2091cd1333a51c32e1491b79 wine-9.0.9-alt1-i586.tar.xz
@@ -216,8 +217,8 @@ d16c300b5451e4fad6eeebeca0949367a7bdf1cb1878fc51f0f9dee33744d3a7 emias_pfx_x64_
# create with wine-10.18.1-alt1-wow64 (universal user: xuser)
# winetricks crypt32
66a31bf72aac7354956c0ce8ddb9a2858b291bb9c8b94229b0820b0119ced97f olimp_pfx_x86_v01.tar.xz
# create with wine_x_tkg_10-0_i586 (universal user: xuser)
cf7f6284fc46d9a0be9756721d04e9f8842a481f805829711d4340fed5e67e69 olimp_pfx_x86_v02.tar.xz
# create with wine-10.18.1-alt2-i586
# winetricks jet40 dotnet45 corefonts lucida opensymbol tahoma cjkfonts mdac28 msxml4 native_oleaut32 vcrun2005
# + psqlodbc_x86.msi installed from script
+5 -3
View File
@@ -737,7 +737,7 @@ EOF
-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" -e "WINE_D3D_CONFIG" \
-e "WH_USE_MESA_GL_OVERRIDE" \
-e "WH_USE_MESA_GL_OVERRIDE" -e "WINEDLLOVERRIDES" \
"$INSTALL_SCRIPT" | awk '{$1=$1;print}' >> "$exe_file".whdb
print_info "Создан файл настроек для $exe_file"
@@ -1307,11 +1307,13 @@ init_wineprefix () {
# добавление ассоциаций файлов для запуска нативного приложения из wine
# пример переменной: WH_XDG_OPEN="txt doc pdf"
check_variables WH_XDG_OPEN "0"
check_variables WH_XDG_OPEN "default"
local WRAPPER="${WH_TMP_DIR}/wh-xdg-open.sh"
local XDG_OPEN_REG="Software\Classes\xdg-open\shell\open\command"
if [[ $WH_XDG_OPEN != "0" ]] ; then
if [[ $WH_XDG_OPEN == "default" ]] ; then
: # пропускаем изменения в реестре
elif [[ $WH_XDG_OPEN != "0" ]] ; then
# проверяем на наличие запрещённых расширений
local forbidden_extensions="cpl dll exe lnk msi"
for ext in $WH_XDG_OPEN; do