Oops. Forgot about zsh_completion in changelog. UPD 0.4.9

CHANGELOG

@@ -1,5 +1,11 @@
 История изменений:
 
+0.4.9:
+* добавлено автодопонение команд для zsh (zsh_completion)
+
+0.4.8:
+* все скрипты для программ daobit-* переведены из ручных установок в автоматические
+
 0.4.7:
 * обновлены скрипты установки и префикс для программ ved-* и ctm-*
 * обновлены скрипты установки для программ daobit-*

autoinstall/daobit-cservice

@@ -9,23 +9,22 @@ export BASE_PFX="daobit_pfx_x86_v01"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cs.exe"
 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" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+prepair_wine
-    prepair_wine
+if try_download "https://files.daobit.ru/CSERVICE/SFX/setup_cs.exe" "${AUTOINSTALL_EXE}" ; then
 
     # фикс постоянного запроса обновления Windows
     get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
 
-    unpack "$2" "${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${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/CService32.exe"
     create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
     try_remove_dir "$AUTOINSTALL_UNPACK"
-else
+    try_remove_file "$AUTOINSTALL_EXE"
-    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
-    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
 fi

autoinstall/daobit-ratlas

@@ -9,23 +9,22 @@ export BASE_PFX="daobit_pfx_x86_v01"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_rk.exe"
 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" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+prepair_wine
-    prepair_wine
+if try_download "https://files.daobit.ru/RATLAS/SFX/setup_rk.exe" "${AUTOINSTALL_EXE}" ; then
 
     # фикс постоянного запроса обновления Windows
     get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
 
-    unpack "$2" "${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${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
+    try_remove_file "$AUTOINSTALL_EXE"
-    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
-    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
 fi

autoinstall/daobit-rinfo

@@ -9,23 +9,22 @@ export BASE_PFX="daobit_pfx_x86_v01"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_ri.exe"
 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" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+prepair_wine
-    prepair_wine
+if try_download "https://files.daobit.ru/RINFO/SFX/setup_ri.exe" "${AUTOINSTALL_EXE}" ; then
 
     # фикс постоянного запроса обновления Windows
     get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
 
-    unpack "$2" "${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${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
+    try_remove_file "$AUTOINSTALL_EXE"
-    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
-    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
 fi

autoinstall/daobit-rtariff

@@ -9,23 +9,22 @@ export BASE_PFX="daobit_pfx_x86_v01"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_rt.exe"
 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" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+prepair_wine
-    prepair_wine
+if try_download "https://files.daobit.ru/RTARIFF/SFX/setup_rt.exe" "${AUTOINSTALL_EXE}" ; then
 
     # фикс постоянного запроса обновления Windows
     get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
 
-    unpack "$2" "${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${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
+    try_remove_file "$AUTOINSTALL_EXE"
-    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
-    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
 fi

winehelper

@@ -259,11 +259,13 @@ unpack () {
     esac
     create_new_dir "$2"
     if [[ $skip_xattr == "1" ]] \
-    && $command "$1" ${outarg}"$2" 2>&1 | grep -v "xattr"
+    && $command "$1" ${outarg}"$2" 2>&1 | sed "/xattr/d"
     then print_ok "Файл $1 распакован."
     elif $command "$1" ${outarg}"$2"
     then print_ok "Файл $1 распакован."
-    else fatal "Распаковать файл $1 не удалось!"
+    else
+        try_remove_file "$1"
+        fatal "Распаковать файл $1 не удалось!"
     fi
     return 0
 }