Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ecc7a401ee | ||
|
|
9b5d4543d7 | ||
|
|
6df0bed1e1 | ||
|
|
532f248643 | ||
|
|
c76750da3b | ||
|
|
7b4c9ec0b7 | ||
|
|
a50315d0e9 | ||
|
|
6ae317f9aa | ||
|
|
1e914273b2 | ||
|
|
01c3c5bd35 | ||
|
|
6738b628f1 | ||
|
|
03939508ff | ||
|
|
638eabb626 | ||
|
|
f6c3c0c1fd |
No files matched your search
@@ -11,6 +11,7 @@ export WINEARCH="win64"
|
||||
export INSTALL_DLL=""
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
export WH_XDG_OPEN="pdf docx scad"
|
||||
|
||||
AUTOINSTALL_URL="https://www.tezis.pro/Setup-APROPOS-Z-SHAREWARE.exe"
|
||||
AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup-APROPOS-Z-SHAREWARE.exe"
|
||||
@@ -23,3 +24,5 @@ if try_download "$AUTOINSTALL_URL" "$AUTOINSTALL_EXE" ; then
|
||||
|
||||
create_desktop "$PROG_NAME" "$DRIVE_C/Program Files/A'PROPOS-Z/Apropos-Z.exe" "$PROG_ICON"
|
||||
fi
|
||||
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
+1
-1
@@ -21,7 +21,7 @@ then
|
||||
KIS_EXE="$2"
|
||||
PROG_PATH="$DRIVE_C/EMIAS"
|
||||
create_new_dir "$PROG_PATH"
|
||||
print_info "Копируем файлы приложениея в каталог $PROG_PATH"
|
||||
print_info "Копируем файлы приложения в каталог $PROG_PATH"
|
||||
cp -fr "$(dirname "$KIS_EXE")"/* "$PROG_PATH/"
|
||||
|
||||
create_desktop "КИС ЕМИАС" "$PROG_PATH/kis.exe" "kis-emias"
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
#!/usr/bin/env bash
|
||||
# info_ru: "КИС Олимп" - программно-аналитический комплекс, состоящий из самостоятельных подключаемых модулей.
|
||||
########################################################################
|
||||
export PROG_URL="https://olimp.best/"
|
||||
export WH_WINE_USE="wine_x_tkg_10-0_i586"
|
||||
export WINEPREFIX="olimp"
|
||||
export PROG_NAME="КИС Олимп"
|
||||
export BASE_PFX="olimp_pfx_x86_v01"
|
||||
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"
|
||||
|
||||
if [[ -f "$2" ]] \
|
||||
&& [[ $(basename "$2") =~ (Loader\.exe) ]]
|
||||
then
|
||||
prepair_wine
|
||||
|
||||
if ! grep -q "psqlodbc_x86" "$WINEPREFIX/winetricks.log" ; then
|
||||
psqlodbc_uri="https://ftp.postgresql.org/pub/odbc/releases/REL-17_00_0007/psqlodbc_x86.msi"
|
||||
psqlodbc_msi="${WH_TMP_DIR}/psqlodbc_x86.msi"
|
||||
try_download "$psqlodbc_uri" "$psqlodbc_msi"
|
||||
wine_run_install "$psqlodbc_msi" /q
|
||||
try_remove_file "$psqlodbc_msi"
|
||||
echo "psqlodbc_x86" >> "$WINEPREFIX/winetricks.log"
|
||||
fi
|
||||
|
||||
KIS_EXE="$2"
|
||||
PROG_PATH="$DRIVE_C/Olimp"
|
||||
create_new_dir "$PROG_PATH"
|
||||
print_info "Копируем файлы приложения в каталог $PROG_PATH"
|
||||
cp -fr "$(dirname "$KIS_EXE")"/* "$PROG_PATH/"
|
||||
|
||||
create_desktop "КИС Олимп" "$PROG_PATH/Loader.exe" "olimp"
|
||||
create_desktop "КИС Олимп (ПУ WINE)" "$DRIVE_C/windows/system32/control.exe" "wh_default"
|
||||
else
|
||||
fatal "Не найден файл Loader.exe. Перезапустите по примеру:
|
||||
winehelper install $1 \"/путь/до/Olimp/Loader.exe\""
|
||||
fi
|
||||
@@ -9,6 +9,7 @@ a862761c432f8619caf8100589678a1cbb523787259120ccd4388089d81e3b17 wine-10.18.1-t
|
||||
e0a84bb4908c3927954d7eef6b8ac7212e442b8c107d000c6890fec340f96183 wine-9.0.14-alt1-amd64.tar.xz
|
||||
f1bf1261550ca2928cefacdb724926d3d6d103433d0ff6882ee9783a50d8f4e4 wine-8.8-staging-amd64.tar.xz
|
||||
61bec1230b37b8fcc69fd45f848b44fd88cc41fcdd5dc3080336d7da63660f40 wine-7.16.1-alt1-amd64.tar.xz
|
||||
fd209c95a3aa507002374417365b3d1119dbe3a0a6d223034171221a2b187b66 wine-9.0-cx-amd64.tar.xz
|
||||
|
||||
##### WINE I586 #####
|
||||
3571c40a787f0386e0160b5d471b1bf11fa2a235b497156cd38198b90bcb4a9f wine_x_tkg_10-0_i586.tar.xz
|
||||
@@ -215,6 +216,11 @@ 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)
|
||||
# winetricks jet40 dotnet45 corefonts lucida opensymbol tahoma cjkfonts mdac28 msxml4 native_oleaut32 vcrun2005
|
||||
# + psqlodbc_x86.msi installed from script
|
||||
|
||||
##### ADDONS #####
|
||||
# addons with ODBC, SSH, *.reg
|
||||
0f4ef434df07bc338ae308af44330590eaa1d9c94b64850514e55b960642d0eb scadoffice_addons_v02.tar.xz
|
||||
+73
-58
@@ -49,12 +49,6 @@ else
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ $1 == "gui" ]] ; then
|
||||
export WH_USE_GUI="1"
|
||||
/usr/bin/env python3 "$DATA_PATH/winehelper_gui.py" &
|
||||
exit 0
|
||||
fi
|
||||
|
||||
##### MESSAGES FUNCTIONS #####
|
||||
if [[ $WH_USE_GUI != "1" ]] ; then
|
||||
print_error () { printf "\E[31m%s Ошибка: $* %s\e[0m\n" ;}
|
||||
@@ -86,6 +80,21 @@ print_confirmation () {
|
||||
return 0
|
||||
}
|
||||
|
||||
##### CHECK NOEXEC FOR /HOME #####
|
||||
if mount -l | grep -E "[[:space:]]/home[[:space:]]" | grep -q "noexec" ; then
|
||||
# export WH_DIST_DIR="/opt/winehelper/dist"
|
||||
# print_warning "/home примонтирован в /etc/fstab с аргументом noexec.\nИспользуем каталог $WH_DIST_DIR"
|
||||
fatal "/home примонтирован в /etc/fstab с аргументом noexec.\nЗапуск портативной версии wine невозможен из домашнего каталога."
|
||||
else
|
||||
export WH_DIST_DIR="$USER_WORK_PATH/dist"
|
||||
fi
|
||||
|
||||
if [[ $1 == "gui" ]] ; then
|
||||
export WH_USE_GUI="1"
|
||||
/usr/bin/env python3 "$DATA_PATH/winehelper_gui.py" &
|
||||
exit 0
|
||||
fi
|
||||
|
||||
##### CHECK VARIABLES #####
|
||||
check_variables () { [[ -z ${!1} ]] && export $1="$2" ;}
|
||||
|
||||
@@ -112,7 +121,6 @@ fi
|
||||
##### DEFAULT VARIABLES #####
|
||||
WH_VULKAN_LIBDIR="$USER_WORK_PATH/vulkan"
|
||||
WH_PREFIXES_DIR="$USER_WORK_PATH/prefixes"
|
||||
WH_DIST_DIR="$USER_WORK_PATH/dist"
|
||||
WH_TMP_DIR="$USER_WORK_PATH/tmp"
|
||||
|
||||
WH_IMAGE_PATH="$DATA_PATH/image"
|
||||
@@ -170,7 +178,7 @@ check_variables WH_VIRTUAL_DESKTOP "default"
|
||||
|
||||
check_variables WINE_WIN_START "start /wait /high /unix"
|
||||
|
||||
check_variables WINE_CPU_TOPOLOGY "8"
|
||||
check_variables WINE_CPU_TOPOLOGY "0"
|
||||
|
||||
check_variables DXVK_VER "none"
|
||||
# check_variables DXVK_CONFIG_FILE "path/to/dxvk.conf"
|
||||
@@ -186,17 +194,12 @@ then fatal "Обнаружена подмена переменной license_agr
|
||||
else readonly license_agreement_file="$(mktemp -d)/$((RANDOM % RANDOM))"
|
||||
fi
|
||||
|
||||
##### CHECK NOEXEC FOR /HOME #####
|
||||
if mount -l | grep -E "[[:space:]]/home[[:space:]]" | grep -q "noexec" ; then
|
||||
fatal "/home примонтирован в /etc/fstab с аргументом noexec.\nЗапуск портативной версии wine невозможен из домашнего каталога."
|
||||
fi
|
||||
|
||||
##### ROOT #####
|
||||
su_run () {
|
||||
if [[ $WH_USE_GUI != "1" ]] ; then
|
||||
local i="1"
|
||||
while [[ $i -le "3" ]] ; do
|
||||
print_info "Для продолжения установки введите root пароль (попытка $i из 3)..."
|
||||
print_info "Для продолжения введите root пароль (попытка $i из 3)..."
|
||||
su - -c "$@" && return 0
|
||||
((i++))
|
||||
done
|
||||
@@ -886,8 +889,12 @@ init_wine_ver () {
|
||||
try_remove_file "$wine_package"
|
||||
fi
|
||||
|
||||
if [[ ${WH_WINE_USE,,} =~ -cx- ]] ; then
|
||||
export WINEUSERNAME="crossover"
|
||||
fi
|
||||
|
||||
# Управление структурой подкаталога Proton "files", перемещая содержимое вверх
|
||||
if [[ ${WINEDIR,,} =~ proton ]] \
|
||||
if [[ ${WH_WINE_USE,,} =~ proton ]] \
|
||||
&& [[ -d "$WINEDIR/files" ]]
|
||||
then
|
||||
print_info "Обнаружена структура каталогов Proton, исправляем пути..."
|
||||
@@ -1154,7 +1161,7 @@ init_wineprefix () {
|
||||
check_variables BASE_PFX "none"
|
||||
|
||||
export DRIVE_C="$WINEPREFIX/drive_c"
|
||||
export XUSER_PATH="$DRIVE_C/users/xuser"
|
||||
export XUSER_PATH="$DRIVE_C/users/$WINEUSERNAME"
|
||||
|
||||
if [[ ! -d "$WINEPREFIX" ]] ; then
|
||||
create_new_dir "$WINEPREFIX"
|
||||
@@ -1416,7 +1423,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
|
||||
WINE_CPU_TOPOLOGY DXVK_VER VKD3D_VER WH_XDG_OPEN WH_USE_CPCSP_PROXY WH_USE_EXTRA_FONTS \
|
||||
WINEUSERNAME
|
||||
do
|
||||
update_last_conf_var "$var" "${!var}"
|
||||
done
|
||||
@@ -1515,9 +1523,10 @@ prepair_wine () {
|
||||
|
||||
init_wine_ver
|
||||
|
||||
[[ "$WINE_CPU_TOPOLOGY" == "0" ]] && unset WINE_CPU_TOPOLOGY
|
||||
|
||||
# отключаем создание .desktop файлов средствами wine
|
||||
# и отключаем winebth, так как может сломать winedevice.exe
|
||||
var_winedlloverride_update "winemenubuilder.exe,winebth.sys=d"
|
||||
var_winedlloverride_update "winemenubuilder.exe=d"
|
||||
|
||||
init_wineprefix
|
||||
use_winetricks
|
||||
@@ -2091,6 +2100,10 @@ create_base_pfx () {
|
||||
[[ -n $1 ]] && export WINEPREFIX="$1"
|
||||
check_prefix_var
|
||||
|
||||
if [[ -f "$WINEPREFIX/last.conf" ]] ; then
|
||||
source "$WINEPREFIX/last.conf"
|
||||
fi
|
||||
|
||||
local prefix_dir drive_c_dir users_dir archive_path pfx_arch
|
||||
prefix_dir="$WINEPREFIX"
|
||||
drive_c_dir="$prefix_dir/drive_c"
|
||||
@@ -2111,22 +2124,22 @@ create_base_pfx () {
|
||||
do sed -i "/$wtlog/d" "$prefix_dir/winetricks.log"
|
||||
done
|
||||
|
||||
# переносим пользовательский каталог в общий для всех "xuser"
|
||||
# переносим пользовательский каталог в общий для всех "$WINEUSERNAME"
|
||||
if [[ -d "$users_dir/$USER" ]] \
|
||||
&& [[ ! -L "$users_dir/$USER" ]]
|
||||
then
|
||||
if [[ -L "$users_dir/xuser" ]]
|
||||
then try_remove_dir "$users_dir/xuser"
|
||||
if [[ -L "$users_dir/$WINEUSERNAME" ]]
|
||||
then try_remove_dir "$users_dir/$WINEUSERNAME"
|
||||
fi
|
||||
create_new_dir "$users_dir/xuser"
|
||||
cp -fr "$users_dir/$USER"/* "$users_dir/xuser/"
|
||||
create_new_dir "$users_dir/$WINEUSERNAME"
|
||||
cp -fr "$users_dir/$USER"/* "$users_dir/$WINEUSERNAME/"
|
||||
try_remove_dir "$users_dir/$WINEUSERNAME/Рабочий стол"
|
||||
fi
|
||||
|
||||
# удаляем всё ненужное для переноса префикса
|
||||
try_remove_file "$prefix_dir/last.conf"
|
||||
try_remove_dir "$prefix_dir/dosdevices/"
|
||||
try_remove_dir "$users_dir/$USER"
|
||||
try_remove_dir "$users_dir/xuser/AppData/Local/Temp/"
|
||||
try_remove_dir "$users_dir/$WINEUSERNAME/AppData/Local/Temp/"
|
||||
try_remove_dir "$drive_c_dir/ProgramData/Package Cache/"
|
||||
try_remove_dir "$drive_c_dir/windows/temp/"
|
||||
try_remove_dir "$drive_c_dir/windows/Installer/"
|
||||
@@ -2163,23 +2176,27 @@ backup_prefix() {
|
||||
temp_prefix_dir="$temp_backup_dir/prefixes/$PREFIX_NAME"
|
||||
temp_users_dir="$temp_prefix_dir/drive_c/users"
|
||||
|
||||
print_info "Начало резервного копирования префикса: $PREFIX_NAME"
|
||||
print_info "Подготовка префикса $PREFIX_NAME к упаковке..."
|
||||
create_new_dir "$temp_backup_dir"
|
||||
create_new_dir "$temp_backup_dir/prefixes/"
|
||||
create_new_dir "$temp_backup_dir/dist/"
|
||||
|
||||
print_info "Подготовка префикса к упаковке..."
|
||||
if [[ -f "$WINEPREFIX/last.conf" ]]; then
|
||||
source "$WINEPREFIX/last.conf"
|
||||
fi
|
||||
|
||||
if cp -a "$WINEPREFIX" "$temp_prefix_dir" ; then
|
||||
try_remove_dir "$temp_prefix_dir/dosdevices"
|
||||
if [[ -d "$temp_users_dir/$USER" ]] \
|
||||
&& [[ ! -L "$temp_users_dir/$USER" ]]
|
||||
then
|
||||
if [[ -L "$temp_users_dir/xuser" ]]
|
||||
then try_remove_dir "$temp_users_dir/xuser"
|
||||
if [[ -L "$temp_users_dir/$WINEUSERNAME" ]]
|
||||
then try_remove_dir "$temp_users_dir/$WINEUSERNAME"
|
||||
fi
|
||||
create_new_dir "$temp_users_dir/xuser"
|
||||
cp -fr "$temp_users_dir/$USER"/* "$temp_users_dir/xuser/"
|
||||
create_new_dir "$temp_users_dir/$WINEUSERNAME"
|
||||
cp -fr "$temp_users_dir/$USER"/* "$temp_users_dir/$WINEUSERNAME/"
|
||||
fi
|
||||
try_remove_dir "$temp_users_dir/$WINEUSERNAME/Рабочий стол"
|
||||
try_remove_dir "$temp_users_dir/$USER"
|
||||
print_ok "Директория префикса подготовлена."
|
||||
else
|
||||
@@ -2188,19 +2205,15 @@ backup_prefix() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ -f "$WINEPREFIX/last.conf" ]]; then
|
||||
source "$WINEPREFIX/last.conf"
|
||||
if [[ -n "$WH_WINE_USE" ]] \
|
||||
&& [[ $WH_WINE_USE != system* ]] \
|
||||
&& [[ -d "$WH_DIST_DIR/$WH_WINE_USE" ]]
|
||||
then
|
||||
print_info "Копирование используемой версии WINE: $WH_WINE_USE"
|
||||
|
||||
if [[ -n "$WH_WINE_USE" ]] \
|
||||
&& [[ $WH_WINE_USE != system* ]] \
|
||||
&& [[ -d "$WH_DIST_DIR/$WH_WINE_USE" ]]
|
||||
then
|
||||
print_info "Копирование используемой версии WINE: $WH_WINE_USE"
|
||||
|
||||
if cp -a "$WH_DIST_DIR/$WH_WINE_USE" "$temp_backup_dir/dist/"
|
||||
then print_ok "WINE скопирован."
|
||||
else fatal "Не удалось скопировать WINE."
|
||||
fi
|
||||
if cp -a "$WH_DIST_DIR/$WH_WINE_USE" "$temp_backup_dir/dist/"
|
||||
then print_ok "WINE скопирован."
|
||||
else fatal "Не удалось скопировать WINE."
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -2304,22 +2317,24 @@ restore_prefix() {
|
||||
fi
|
||||
fi
|
||||
|
||||
print_info "Восстановление ярлыков для префикса $prefix_name..."
|
||||
export RESTORE_FROM_BACKUP="1" # Устанавливаем флаг восстановления
|
||||
while IFS='=' read -r name_desktop exe_path icon_name ; do
|
||||
if [[ -f "$WH_PREFIXES_DIR/$prefix_name/desktop.list" ]] ; then
|
||||
print_info "Восстановление ярлыков для префикса $prefix_name..."
|
||||
export RESTORE_FROM_BACKUP="1" # Устанавливаем флаг восстановления
|
||||
while IFS='=' read -r name_desktop exe_path icon_name ; do
|
||||
|
||||
local full_exe_path="$WH_PREFIXES_DIR/$prefix_name${exe_path}"
|
||||
local full_icon_path="$WH_PREFIXES_DIR/$prefix_name/icons/$icon_name"
|
||||
local full_exe_path="$WH_PREFIXES_DIR/$prefix_name${exe_path}"
|
||||
local full_icon_path="$WH_PREFIXES_DIR/$prefix_name/icons/$icon_name"
|
||||
|
||||
if [[ -f "$full_exe_path" ]]; then
|
||||
print_info "Создание ярлыка для $name_desktop"
|
||||
create_desktop "$name_desktop" "$full_exe_path" "$full_icon_path"
|
||||
else
|
||||
print_warning "Исполняемый файл для ярлыка '$name_desktop' не найден: $full_exe_path"
|
||||
fi
|
||||
done < "$WH_PREFIXES_DIR/$prefix_name/desktop.list"
|
||||
unset RESTORE_FROM_BACKUP # Снимаем флаг после завершения
|
||||
print_ok "Ярлыки для префикса $prefix_name восстановлены."
|
||||
if [[ -f "$full_exe_path" ]]; then
|
||||
print_info "Создание ярлыка для $name_desktop"
|
||||
create_desktop "$name_desktop" "$full_exe_path" "$full_icon_path"
|
||||
else
|
||||
print_warning "Исполняемый файл для ярлыка '$name_desktop' не найден: $full_exe_path"
|
||||
fi
|
||||
done < "$WH_PREFIXES_DIR/$prefix_name/desktop.list"
|
||||
unset RESTORE_FROM_BACKUP # Снимаем флаг после завершения
|
||||
print_ok "Ярлыки для префикса $prefix_name восстановлены."
|
||||
fi
|
||||
fi
|
||||
else
|
||||
try_remove_dir "$temp_extract_dir"
|
||||
|
||||
+3
-2
@@ -32,6 +32,7 @@ class Var:
|
||||
THIRD_PARTY_FILE = os.environ.get("THIRD_PARTY_FILE")
|
||||
GENERAL = os.environ.get("GENERAL")
|
||||
WH_WINETRICKS = os.environ.get("WH_WINETRICKS")
|
||||
WH_DIST_DIR = os.environ.get("WH_DIST_DIR")
|
||||
|
||||
|
||||
class WinetricksManagerDialog(QDialog):
|
||||
@@ -816,7 +817,7 @@ class WineVersionSelectionDialog(QDialog):
|
||||
|
||||
def _get_installed_versions(self):
|
||||
"""Возвращает список локально установленных версий Wine."""
|
||||
dist_path = os.path.join(Var.USER_WORK_PATH, "dist")
|
||||
dist_path = os.path.join(Var.WH_DIST_DIR)
|
||||
if not os.path.isdir(dist_path):
|
||||
return []
|
||||
try:
|
||||
@@ -4005,7 +4006,7 @@ class WineHelperGUI(QMainWindow):
|
||||
print(f"Предупреждение: не удалось прочитать или обработать {last_conf_path}: {e}")
|
||||
|
||||
if wh_wine_use and not wh_wine_use.startswith('system'):
|
||||
local_wine_path = os.path.join(Var.USER_WORK_PATH, "dist", wh_wine_use, "bin", "wine")
|
||||
local_wine_path = os.path.join(Var.WH_DIST_DIR, wh_wine_use, "bin", "wine")
|
||||
if os.path.exists(local_wine_path):
|
||||
return local_wine_path
|
||||
QMessageBox.warning(self, "Предупреждение",
|
||||
|
||||
Reference in new issue
Block a user