Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f44432388 | ||
|
|
fbfccd0417 | ||
|
|
1942d49f4d | ||
|
|
ab2933f8b0 | ||
|
|
4b985417c4 | ||
|
|
d52bec4798 | ||
|
|
f2c7ecf926 | ||
|
|
a929411daf | ||
|
|
8114b3cb54 | ||
|
|
04e974a0b7 | ||
|
|
efe8ef7267 |
No files matched your search
@@ -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}"
|
||||
|
||||
@@ -10,6 +10,7 @@ export WINEARCH="win64"
|
||||
export INSTALL_DLL="crypt32"
|
||||
export WH_WINDOWS_VER="7"
|
||||
export WH_USE_CPCSP_PROXY="1"
|
||||
export CPCSP_PROXY_WOW64_VER="0.7.7-alt1.1-em-wow64"
|
||||
export STAGING_SHARED_MEMORY="1"
|
||||
export WINE_LARGE_ADDRESS_AWARE="1"
|
||||
|
||||
|
||||
+3
-2
@@ -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) ]]
|
||||
|
||||
+4
-2
@@ -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
|
||||
@@ -117,6 +118,7 @@ edf16d2b37bc77d121d5d81b06b60d3f694e0060c6606e729ceab30de3d27466 vkd3d-proton-s
|
||||
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
|
||||
5a0c582f662ac501865f569124c153b43cded72eb98a001eaa7ebd5b2168f1a2 wine-cpcsp_proxy-0.7.7-alt1.1-em-wow64.tar.xz
|
||||
|
||||
##### FONTS #####
|
||||
405bfe3b7c7f80034837c05656535053305727ee4bf1d993521b67b71d08ebc6 extra_fonts_v01.tar.xz
|
||||
@@ -216,8 +218,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
|
||||
|
||||
|
||||
+16
-8
@@ -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"
|
||||
@@ -947,6 +947,7 @@ init_wine_ver () {
|
||||
fi
|
||||
|
||||
if [[ $WH_USE_CPCSP_PROXY == "1" ]] ; then
|
||||
unset UPDATE_CPCSP_PROXY
|
||||
local cpcsp_proxy_ver
|
||||
if [[ $WH_WINE_WOW64 == "1" ]]
|
||||
then cpcsp_proxy_ver="$CPCSP_PROXY_WOW64_VER"
|
||||
@@ -955,6 +956,7 @@ init_wine_ver () {
|
||||
if [[ ! -f "$WINEDIR/cpcsp_proxy.ver" ]] \
|
||||
|| ! grep -q "$cpcsp_proxy_ver" "$WINEDIR/cpcsp_proxy.ver"
|
||||
then
|
||||
export UPDATE_CPCSP_PROXY="1"
|
||||
CPCSP_PROXY_NAME="wine-cpcsp_proxy-$cpcsp_proxy_ver"
|
||||
CPCSP_PROXY_URL="$CLOUD_URL/$CPCSP_PROXY_NAME.tar.xz"
|
||||
|
||||
@@ -1307,11 +1309,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
|
||||
@@ -1351,16 +1355,18 @@ init_wineprefix () {
|
||||
|
||||
# настраиваем префикс для работы с cpcsp_proxy
|
||||
if [[ $WH_USE_CPCSP_PROXY == "1" ]] ; then
|
||||
if ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg" \
|
||||
|| [[ $REBOOT_PFX == "1" ]]
|
||||
if [[ $UPDATE_CPCSP_PROXY == "1" ]] \
|
||||
|| [[ $REBOOT_PFX == "1" ]] \
|
||||
|| ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg"
|
||||
then
|
||||
print_info "Запускаем настройку cpcsp_proxy..."
|
||||
CPCSP_PROXY_OK="0"
|
||||
|
||||
try_copy_wine_dll_to_pfx_64 "cpcsp_proxy.dll"
|
||||
try_copy_wine_dll_to_pfx_32 "cpcsp_proxy.dll"
|
||||
|
||||
if [[ $WH_WINE_WOW64 == "1" ]] ; then
|
||||
print_info "Запускаем настройку cpcsp_proxy версии $CPCSP_PROXY_WOW64_VER"
|
||||
|
||||
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"
|
||||
@@ -1371,6 +1377,8 @@ init_wineprefix () {
|
||||
/s /n /i cpcsp_proxy.dll 2>&1 | tee -a "$WINEPREFIX/cpcsp_setup.log"
|
||||
wait_wineserver
|
||||
else
|
||||
print_info "Запускаем настройку cpcsp_proxy версии $CPCSP_PROXY_X86_64_VER"
|
||||
|
||||
try_copy_wine_dll_to_pfx_64 "cpcsp_proxy_setup.exe"
|
||||
try_copy_wine_dll_to_pfx_32 "cpcsp_proxy_setup.exe"
|
||||
|
||||
@@ -1423,8 +1431,8 @@ init_wineprefix () {
|
||||
fi
|
||||
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_CPCSP_PROXY WH_USE_EXTRA_FONTS \
|
||||
WINEUSERNAME
|
||||
WINE_CPU_TOPOLOGY DXVK_VER VKD3D_VER WH_XDG_OPEN WH_USE_EXTRA_FONTS \
|
||||
WINEUSERNAME WH_USE_CPCSP_PROXY CPCSP_PROXY_X86_64_VER CPCSP_PROXY_WOW64_VER
|
||||
do
|
||||
update_last_conf_var "$var" "${!var}"
|
||||
done
|
||||
|
||||
Reference in new issue
Block a user