diff --git a/image/daobitratlas.png b/image/daobitratlas.png new file mode 100644 index 0000000..23424ca Binary files /dev/null and b/image/daobitratlas.png differ diff --git a/manualinstall/daobit-cservice b/manualinstall/daobit-cservice index 1530678..1eeb1cd 100644 --- a/manualinstall/daobit-cservice +++ b/manualinstall/daobit-cservice @@ -5,15 +5,15 @@ export WH_WINE_USE="wine_x_tkg_10-0_i586" # wine-9.0.9-alt1-i586" export WINEPREFIX="daobit" export PROG_NAME="Сервис обновления ПО" export PROG_ICON="daobitcservice" -export BASE_PFX="none" +export BASE_PFX="daobit_pfx_x86_v01" 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" +EXE_SETUP_NAME="setup_cs.exe" -if [[ -f "$2" ]] ; then +if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then prepair_wine 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" @@ -24,5 +24,5 @@ if [[ -f "$2" ]] ; then try_remove_dir "$AUTOINSTALL_UNPACK" else fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру: - winehelper install $1 \"/путь/до/установочного_файла\"" + winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\"" fi diff --git a/manualinstall/daobit-ratlas b/manualinstall/daobit-ratlas index 85f335c..191eea6 100644 --- a/manualinstall/daobit-ratlas +++ b/manualinstall/daobit-ratlas @@ -9,11 +9,11 @@ export BASE_PFX="none" 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" +EXE_SETUP_NAME="setup_rk.exe" -if [[ -f "$2" ]] ; then +if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then prepair_wine 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" @@ -24,5 +24,5 @@ if [[ -f "$2" ]] ; then try_remove_dir "$AUTOINSTALL_UNPACK" else fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру: - winehelper install $1 \"/путь/до/установочного_файла\"" + winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\"" fi diff --git a/manualinstall/daobit-rinfo b/manualinstall/daobit-rinfo index 3f5bd14..b21dbbb 100644 --- a/manualinstall/daobit-rinfo +++ b/manualinstall/daobit-rinfo @@ -5,15 +5,15 @@ export WH_WINE_USE="wine_x_tkg_10-0_i586" # wine-9.0.9-alt1-i586" export WINEPREFIX="daobit" export PROG_NAME="R-Инфо" export PROG_ICON="daobitrinfo" -export BASE_PFX="none" +export BASE_PFX="daobit_pfx_x86_v01" 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" +EXE_SETUP_NAME="setup_ri.exe" -if [[ -f "$2" ]] ; then +if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then prepair_wine 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" @@ -24,5 +24,5 @@ if [[ -f "$2" ]] ; then try_remove_dir "$AUTOINSTALL_UNPACK" else fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру: - winehelper install $1 \"/путь/до/установочного_файла\"" + winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\"" fi diff --git a/manualinstall/daobit-rtariff b/manualinstall/daobit-rtariff index 35cf937..d2ec439 100644 --- a/manualinstall/daobit-rtariff +++ b/manualinstall/daobit-rtariff @@ -5,15 +5,15 @@ export WH_WINE_USE="wine_x_tkg_10-0_i586" # wine-9.0.9-alt1-i586" export WINEPREFIX="daobit" export PROG_NAME="R-Тариф" export PROG_ICON="daobitrtariff" -export BASE_PFX="none" +export BASE_PFX="daobit_pfx_x86_v01" 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" +EXE_SETUP_NAME="setup_rt.exe" -if [[ -f "$2" ]] ; then +if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then prepair_wine 7z x -y "$2" -o"${AUTOINSTALL_UNPACK}" @@ -24,5 +24,5 @@ if [[ -f "$2" ]] ; then try_remove_dir "$AUTOINSTALL_UNPACK" else fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру: - winehelper install $1 \"/путь/до/установочного_файла\"" + winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\"" fi diff --git a/sha256sum.list b/sha256sum.list index 0ac754d..6734b2f 100755 --- a/sha256sum.list +++ b/sha256sum.list @@ -59,3 +59,7 @@ d026d799f8d3893c64c749661240d76896d45fd14fdb6665bf0f875a4a05bcdb spravkibk_pfx_ dfb44ce5e5af7dba1686932c63d6b05e5dd6919a21c78130a7d1d0271b93958e audiorecstation_pfx_v01.tar.xz # create with wine_x_tkg_10-0_i586 (universal user: xuser) # winetricks gdiplus vcrun2022 xact winhttp dotnet40 dotnet48 andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts dsound + +00516ef51079d68ad0f9621c8270e0f86318539b63ebf1085d0faba36896e4ac daobit_pfx_x86_v01.tar.xz +# create with wine_x_tkg_10-0_i586 (universal user: xuser) +# winetricks arial dotnet7 dotnetdesktop7 renderer=gdi