From ecfab64e45f4d7fd15a62b75b5bfca256c50e951 Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Mon, 14 Apr 2025 17:28:25 +0600 Subject: [PATCH] added manualinstall/daobit unpack --- manualinstall/daobit-cservice | 6 +++++- manualinstall/daobit-ratlas | 6 +++++- manualinstall/daobit-rinfo | 6 +++++- manualinstall/daobit-rtariff | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/manualinstall/daobit-cservice b/manualinstall/daobit-cservice index 539c079..1530678 100644 --- a/manualinstall/daobit-cservice +++ b/manualinstall/daobit-cservice @@ -10,14 +10,18 @@ export WH_WINDOWS_VER="10" export WINEARCH="win32" export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi" # export USE_RENDERER="proton" +AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cs" +AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/SETUP.EXE" if [[ -f "$2" ]] ; then prepair_wine - wine_run_install "$2" /auto /hide + 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" + wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\CSERVICE" /auto /hide WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/CSERVICE/daoservc.exe" create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" + try_remove_dir "$AUTOINSTALL_UNPACK" else fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру: winehelper install $1 \"/путь/до/установочного_файла\"" diff --git a/manualinstall/daobit-ratlas b/manualinstall/daobit-ratlas index 607ad39..85f335c 100644 --- a/manualinstall/daobit-ratlas +++ b/manualinstall/daobit-ratlas @@ -10,14 +10,18 @@ export WH_WINDOWS_VER="10" export WINEARCH="win32" export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi" # export USE_RENDERER="proton" +AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rk" +AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rk/setup.exe" if [[ -f "$2" ]] ; then prepair_wine - wine_run_install "$2" /auto /hide + 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" + wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RAtlas" /auto /hide WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RAtlas/ratlas.exe" create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" + try_remove_dir "$AUTOINSTALL_UNPACK" else fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру: winehelper install $1 \"/путь/до/установочного_файла\"" diff --git a/manualinstall/daobit-rinfo b/manualinstall/daobit-rinfo index 1f30221..3f5bd14 100644 --- a/manualinstall/daobit-rinfo +++ b/manualinstall/daobit-rinfo @@ -10,14 +10,18 @@ export WH_WINDOWS_VER="10" export WINEARCH="win32" export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi" # export USE_RENDERER="proton" +AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_ri" +AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_ri/setup.exe" if [[ -f "$2" ]] ; then prepair_wine - wine_run_install "$2" /auto /hide + 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" + wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RInfo" /auto /hide WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RInfo/rinfo.exe" create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" + try_remove_dir "$AUTOINSTALL_UNPACK" else fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру: winehelper install $1 \"/путь/до/установочного_файла\"" diff --git a/manualinstall/daobit-rtariff b/manualinstall/daobit-rtariff index b4d23c2..35cf937 100644 --- a/manualinstall/daobit-rtariff +++ b/manualinstall/daobit-rtariff @@ -10,14 +10,18 @@ export WH_WINDOWS_VER="10" export WINEARCH="win32" export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi" # export USE_RENDERER="proton" +AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rt" +AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rt/setup.exe" if [[ -f "$2" ]] ; then prepair_wine - wine_run_install "$2" /auto /hide + 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" + wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RTariff" /auto /hide WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RTariff/Tariff.exe" create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" + try_remove_dir "$AUTOINSTALL_UNPACK" else fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру: winehelper install $1 \"/путь/до/установочного_файла\""