Merge remote-tracking branch 'origin/main' into feature/web-versions-view

README.md

@@ -155,6 +155,7 @@ Luci: Services/podkop
 - [ ] Валидации предустановленных значений. Если прописаны другие, то вывод в лог о неизвестной переменной и продолжение работы
 - [ ] Добавление в список доменов домены первого уровня (LuCI)
 - [ ] Проверка, что версия в makefile совпадает с тегом
+- [ ] Don't touch my DHCP!
 
 Приоритет 2
 - [x] Списки доменов и подсетей с роутера

install.sh

@@ -43,29 +43,35 @@ main() {
         add_tunnel
     fi
 
-    wget -qO- "$REPO" | grep -o 'https://[^"[:space:]]*\.ipk' | while read -r url; do
+    download_success=0
+    while read -r url; do
         filename=$(basename "$url")
         filepath="$DOWNLOAD_DIR/$filename"
                
         attempt=0
         while [ $attempt -lt $COUNT ]; do
-            if [ -f "$filepath" ] && [ -s "$filepath" ]; then
-                echo "$filename has already been uploaded"
-                break
-            fi
-
             echo "Download $filename (count $((attempt+1)))..."
-            wget -q -O "$filepath" "$url"
+            if wget -q -O "$filepath" "$url"; then
-            
+                if [ -s "$filepath" ]; then
-            if [ -s "$filepath" ]; then
+                    echo "$filename successfully downloaded"
-                echo "$filename successfully downloaded"
+                    download_success=1
-            else
+                    break
-                echo "Download error $filename. Retry..."
+                fi
-                rm -f "$filepath"
             fi
+            echo "Download error $filename. Retry..."
+            rm -f "$filepath"
             attempt=$((attempt+1))
         done
-    done
+        
+        if [ $attempt -eq $COUNT ]; then
+            echo "Failed to download $filename after $COUNT attempts"
+        fi
+    done < <(wget -qO- "$REPO" | grep -o 'https://[^"[:space:]]*\.ipk')
+    
+    if [ $download_success -eq 0 ]; then
+        echo "No packages were downloaded successfully"
+        exit 1
+    fi
     
     for pkg in podkop luci-app-podkop; do
         file=$(ls "$DOWNLOAD_DIR" | grep "^$pkg" | head -n 1)
@@ -96,8 +102,7 @@ main() {
         done
     fi
 
-
+    find "$DOWNLOAD_DIR" -type f -name '*podkop*' -exec rm {} \;
-    rm -f $DOWNLOAD_DIR/podkop*.ipk $DOWNLOAD_DIR/luci-app-podkop*.ipk $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk
 
     if [ "$IS_SHOULD_RESTART_NETWORK" ]; then
         printf "\033[32;1mRestart network\033[0m\n"

luci-app-podkop/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-podkop
-PKG_VERSION:=0.3.9
+PKG_VERSION:=0.3.10
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI podkop app

podkop/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podkop
-PKG_VERSION:=0.3.9
+PKG_VERSION:=0.3.10
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=ITDog <podkop@itdog.info>
@@ -33,6 +33,8 @@ define Package/podkop/prerm
 
 grep -q "105 podkop" /etc/iproute2/rt_tables && sed -i "/105 podkop/d" /etc/iproute2/rt_tables
 
+/etc/init.d/podkop stop
+
 exit 0
 endef
 

podkop/files/etc/init.d/podkop

@@ -76,7 +76,7 @@ stop_service() {
     remove_cron_job
     dnsmasq_rm
 
-    rm -rf /tmp/podkop/*
+    rm -rf /tmp/podkop/*.lst
 
     log "Flush nft"
     if nft list table inet PodkopTable >/dev/null 2>&1; then