3 Commits
Author SHA1 Message Date
root 520804d732 fix: dns nameservers 2026-04-14 17:16:42 +04:00
root 179470709f cosmetic: terminal output 2026-04-14 15:58:04 +04:00
root d17ec7e084 fix: fixed pattern 2026-04-14 15:41:11 +04:00
2 changed files with 9 additions and 5 deletions
+6 -5
View File
@@ -11,6 +11,7 @@ fix_dns() {
local dns2="1.0.0.1" local dns2="1.0.0.1"
if ! grep -q "$dns1" /etc/resolv.conf; then if ! grep -q "$dns1" /etc/resolv.conf; then
printf "Patching DNS for restore... " printf "Patching DNS for restore... "
sed -i '/^nameserver/d' /etc/resolv.conf
sed -i "1i nameserver $dns1" /etc/resolv.conf sed -i "1i nameserver $dns1" /etc/resolv.conf
sed -i "2i nameserver $dns2" /etc/resolv.conf sed -i "2i nameserver $dns2" /etc/resolv.conf
echo "OK" echo "OK"
@@ -47,7 +48,7 @@ case "$CMD" in
echo "Removing conflicts:" echo "Removing conflicts:"
if [ -n "$H_REPLACE" ]; then 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].*$//') REMOVABLE=$(apk list --installed | grep -E "$pattern" | awk '{print $1}' | sed 's/-[0-9].*$//')
for p in $REMOVABLE; do for p in $REMOVABLE; do
printf " [-] %s... " "$p" printf " [-] %s... " "$p"
@@ -59,7 +60,7 @@ case "$CMD" in
echo "Installing packages:" echo "Installing packages:"
for pkg in $(cat "$LOCAL_LST"); do for pkg in $(cat "$LOCAL_LST"); do
if apk info -e "$pkg" >/dev/null 2>&1; then if apk info -e "$pkg" >/dev/null 2>&1; then
echo " [s] $pkg... is already installed" echo " [=] $pkg... is already installed"
else else
fix_dns fix_dns
printf " [+] $pkg... " printf " [+] $pkg... "
@@ -73,7 +74,7 @@ case "$CMD" in
[ -f /etc/resolv.conf-backup ] && mv /etc/resolv.conf-backup /etc/resolv.conf [ -f /etc/resolv.conf-backup ] && mv /etc/resolv.conf-backup /etc/resolv.conf
echo "Summary:" echo "Summary:"
echo " Restore complete" echo " [+] Restoring packages completed"
echo " Reboot is recommended" echo " [!] Reboot required"
;; ;;
esac esac
+3
View File
@@ -165,6 +165,9 @@ case "$1" in
if [ -n "$SELECTED_PATH" ]; then 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"; } [ "$s_choice" -eq 2 ] && { cp "$SELECTED_PATH" /tmp/restore.tar.gz; SELECTED_PATH="/tmp/restore.tar.gz"; umount "$S_MOUNT"; }
sysupgrade -r "$SELECTED_PATH" sysupgrade -r "$SELECTED_PATH"
echo "Summary:"
echo " [+] Restoring configs completed"
echo " [!] Reboot required"
fi fi
;; ;;
2) 2)