fix: dns nameservers

.env-example

@@ -1,4 +1,4 @@
-# "cifs" or "nfs"
+# "smb" or "nfs"
 STORAGE_TYPE="nfs"
 
 # ip or hostname

README.md

@@ -18,7 +18,7 @@
 #### Поддержка удалённого хранилища
 
 - `NFS`
-- `CIFS`
+- `SMB`
 
 #### Очистка старых бэкапов (локально и удалённо)
 
@@ -136,7 +136,7 @@ H_REPLACE="wpad dnsmasq"
 apk add nfs-utils kmod-fs-nfs kmod-fs-nfs-v3 kmod-fs-nfs-v4
 ```
 
-#### Для CIFS
+#### Для SMB
 ```bash
 apk add cifsmount kmod-fs-cifs
 ```

backup-apk.sh

@@ -11,6 +11,7 @@ fix_dns() {
     local dns2="1.0.0.1"
     if ! grep -q "$dns1" /etc/resolv.conf; then
         printf "Patching DNS for restore... "
+        sed -i '/^nameserver/d' /etc/resolv.conf
         sed -i "1i nameserver $dns1" /etc/resolv.conf
         sed -i "2i nameserver $dns2" /etc/resolv.conf
         echo "OK"
@@ -47,7 +48,7 @@ case "$CMD" in
 
         echo "Removing conflicts:"
         if [ -n "$H_REPLACE" ]; then
-            local pattern=$(echo "$H_REPLACE" | sed 's/ /|/g')
+            pattern=$(echo "$H_REPLACE" | sed 's/ /|/g')
             REMOVABLE=$(apk list --installed | grep -E "$pattern" | awk '{print $1}' | sed 's/-[0-9].*$//')
             for p in $REMOVABLE; do 
                 printf " [-] %s... " "$p"
@@ -59,7 +60,7 @@ case "$CMD" in
         echo "Installing packages:"
         for pkg in $(cat "$LOCAL_LST"); do
             if apk info -e "$pkg" >/dev/null 2>&1; then
-                echo " [s] $pkg... is already installed"
+                echo " [=] $pkg... is already installed"
             else
                 fix_dns
                 printf " [+] $pkg... "
@@ -73,7 +74,7 @@ case "$CMD" in
 
         [ -f /etc/resolv.conf-backup ] && mv /etc/resolv.conf-backup /etc/resolv.conf
         echo "Summary:"
-        echo "  Restore complete"
+        echo " [+] Restoring packages completed"
-        echo "  Reboot is recommended"
+        echo " [!] Reboot required"
         ;;
-esac
+esac

backup-manager.sh

@@ -39,7 +39,7 @@ check_dependencies() {
     printf "Checking %s dependencies... " "$STORAGE_TYPE"
     local pkgs=""
     [ "$STORAGE_TYPE" = "nfs" ] && pkgs="nfs-utils kmod-fs-nfs kmod-fs-nfs-v3 kmod-fs-nfs-v4"
-    [ "$STORAGE_TYPE" = "cifs" ] && pkgs="cifsmount kmod-fs-cifs"
+    [ "$STORAGE_TYPE" = "smb" ] && pkgs="cifsmount kmod-fs-cifs"
     
     local missing=""
     for pkg in $pkgs; do
@@ -165,6 +165,9 @@ case "$1" in
                 if [ -n "$SELECTED_PATH" ]; then
                     [ "$s_choice" -eq 2 ] && { cp "$SELECTED_PATH" /tmp/restore.tar.gz; SELECTED_PATH="/tmp/restore.tar.gz"; umount "$S_MOUNT"; }
                     sysupgrade -r "$SELECTED_PATH"
+                    echo "Summary:"
+                    echo "  [+] Restoring configs completed"
+                    echo "  [!] Reboot required"
                 fi
                 ;;
             2)