diff --git a/awg_config.sh b/awg_config.sh index a4f9f69..0db4eea 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -318,7 +318,7 @@ config_files="network firewall https-dns-proxy dhcp" -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/beta_zapret" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/new_awg_podkop" checkPackageAndInstall "https-dns-proxy" "0" @@ -575,7 +575,7 @@ fi path_podkop_config="/etc/config/podkop" path_podkop_config_backup="/root/podkop" -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/beta_zapret" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/new_awg_podkop" if [ -f "/etc/init.d/podkop" ]; then printf "Podkop installed. Reconfigured on AWG WARP and Opera Proxy? (y/n): \n" diff --git a/configure_zaprets.sh b/configure_zaprets.sh index dd1fd70..588bf4d 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -1,6 +1,6 @@ #!/bin/sh -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/beta_zapret" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/new_awg_podkop" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp diff --git a/off_configure_zaprets.sh b/off_configure_zaprets.sh index c1b384e..be15156 100644 --- a/off_configure_zaprets.sh +++ b/off_configure_zaprets.sh @@ -1,6 +1,6 @@ #!/bin/sh -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/beta_zapret" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/new_awg_podkop" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp diff --git a/podkop_packets/luci-app-podkop_v0.5.6-r1_all.ipk b/podkop_packets/luci-app-podkop_v0.5.6-r1_all.ipk new file mode 100644 index 0000000..acff958 Binary files /dev/null and b/podkop_packets/luci-app-podkop_v0.5.6-r1_all.ipk differ diff --git a/podkop_packets/luci-i18n-podkop-ru_0.5.6.ipk b/podkop_packets/luci-i18n-podkop-ru_0.5.6.ipk new file mode 100644 index 0000000..9fad33b Binary files /dev/null and b/podkop_packets/luci-i18n-podkop-ru_0.5.6.ipk differ diff --git a/podkop_packets/podkop_v0.5.6-r1_all.ipk b/podkop_packets/podkop_v0.5.6-r1_all.ipk new file mode 100644 index 0000000..b1715a6 Binary files /dev/null and b/podkop_packets/podkop_v0.5.6-r1_all.ipk differ diff --git a/run_universal_config.sh b/run_universal_config.sh index c065835..047afe5 100644 --- a/run_universal_config.sh +++ b/run_universal_config.sh @@ -7,10 +7,10 @@ findVersion="24.10.2" if echo "$DESCRIPTION" | grep -qi -- "$findKey" && printf '%s\n%s\n' "$findVersion" "$VERSION" | sort -V | tail -n1 | grep -qx -- "$VERSION"; then printf "\033[32;1mThis new firmware. Running new scprit...\033[0m\n" - wget --no-check-certificate -O /tmp/universal_config_new_podkop.sh https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/beta_zapret/universal_config_new_podkop.sh && chmod +x /tmp/universal_config_new_podkop.sh && /tmp/universal_config_new_podkop.sh $1 $2 + wget --no-check-certificate -O /tmp/universal_config_new_podkop.sh https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/new_awg_podkop/universal_config_new_podkop.sh && chmod +x /tmp/universal_config_new_podkop.sh && /tmp/universal_config_new_podkop.sh $1 $2 else printf "\033[32;1mThis old firmware.\nRecommendation, upgrade firmware to actual release...\nSleep 5 sec...\033[0m\n" sleep 5 printf "\033[32;1mRunning old scprit...\033[0m\n" - wget --no-check-certificate -O /tmp/universal_config.sh https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/beta_zapret/universal_config.sh && chmod +x /tmp/universal_config.sh && /tmp/universal_config.sh $1 $2 + wget --no-check-certificate -O /tmp/universal_config.sh https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/new_awg_podkop/universal_config.sh && chmod +x /tmp/universal_config.sh && /tmp/universal_config.sh $1 $2 fi \ No newline at end of file diff --git a/universal_config.sh b/universal_config.sh index 88dd6d5..714678e 100644 --- a/universal_config.sh +++ b/universal_config.sh @@ -549,7 +549,7 @@ firewall https-dns-proxy youtubeUnblock dhcp" -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/beta_zapret" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/new_awg_podkop" checkPackageAndInstall "https-dns-proxy" "0" @@ -946,7 +946,7 @@ service odhcpd restart path_podkop_config="/etc/config/podkop" path_podkop_config_backup="/root/podkop" -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/beta_zapret" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/new_awg_podkop" messageComplete="" diff --git a/universal_config_new_podkop.sh b/universal_config_new_podkop.sh index 17040fd..3dd9832 100644 --- a/universal_config_new_podkop.sh +++ b/universal_config_new_podkop.sh @@ -500,54 +500,27 @@ encoded_code="IyEvYmluL3NoCgojINCn0YLQtdC90LjQtSDQvNC+0LTQtdC70Lgg0LjQtyDRhNCw0L eval "$(echo "$encoded_code" | base64 --decode)" #проверка и установка пакетов AmneziaWG -install_awg_packages +#install_awg_packages checkPackageAndInstall "jq" "1" checkPackageAndInstall "curl" "1" checkPackageAndInstall "unzip" "1" -#checkPackageAndInstall "sing-box" "1" checkPackageAndInstall "opera-proxy" "1" checkPackageAndInstall "zapret" "1" -########### -manage_package "podkop" "enable" "stop" - -PACKAGE="sing-box" -REQUIRED_VERSION="1.11.15" - -INSTALLED_VERSION=$(opkg list-installed | grep "^$PACKAGE" | cut -d ' ' -f 3) -if [ -n "$INSTALLED_VERSION" ] && [ "$INSTALLED_VERSION" != "$REQUIRED_VERSION" ]; then - echo "Version package $PACKAGE not equal $REQUIRED_VERSION. Removed packages..." - opkg remove --force-removal-of-dependent-packages $PACKAGE +findVersion="1.12.0" +if printf '%s\n%s\n' "$findVersion" "$VERSION" | sort -V | tail -n1 | grep -qx -- "$VERSION"; then + printf "\033[32;1mInstalled new sing-box. Running scprit...\033[0m\n" +else + printf "\033[32;1mInstalled old sing-box. Reinstall sing-box...\033[0m\n" + manage_package "podkop" "enable" "stop" + opkg remove --force-removal-of-dependent-packages "sing-box" + checkPackageAndInstall "sing-box" "1" fi -INSTALLED_VERSION=$(opkg list-installed | grep "^$PACKAGE") -if [ -z "$INSTALLED_VERSION" ]; then - PACK_NAME="sing-box" - AWG_DIR="/tmp/$PACK_NAME" - SINGBOX_FILENAME="sing-box_1.11.15_openwrt_aarch64_cortex-a53.ipk" - BASE_URL="https://github.com/SagerNet/sing-box/releases/download/v1.11.15/" - DOWNLOAD_URL="${BASE_URL}${SINGBOX_FILENAME}" - mkdir -p "$AWG_DIR" - #echo $DOWNLOAD_URL - - wget -O "$AWG_DIR/$SINGBOX_FILENAME" "$DOWNLOAD_URL" - if [ $? -eq 0 ]; then - echo "$PACK_NAME file downloaded successfully" - else - echo "Error downloading $PACK_NAME. Please, install $PACK_NAME manually and run the script again" - exit 1 - fi - - opkg install "$AWG_DIR/$SINGBOX_FILENAME" - if [ $? -eq 0 ]; then - echo "$PACK_NAME file installing successfully" - else - echo "Error installing $PACK_NAME. Please, install $PACK_NAME manually and run the script again" - exit 1 - fi -fi -########### +opkg upgrade amneziawg-tools +opkg upgrade kmod-amneziawg +opkg upgrade luci-app-amneziawg opkg upgrade zapret opkg upgrade luci-app-zapret @@ -576,7 +549,7 @@ doh-proxy zapret dhcp dns-failsafe-proxy" -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/beta_zapret" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/new_awg_podkop" checkPackageAndInstall "luci-app-dns-failsafe-proxy" "1" checkPackageAndInstall "luci-i18n-stubby-ru" "1" @@ -870,6 +843,7 @@ do uci set network.${INTERFACE_NAME}.awg_h2=$H2 uci set network.${INTERFACE_NAME}.awg_h3=$H3 uci set network.${INTERFACE_NAME}.awg_h4=$H4 + uci set network.${INTERFACE_NAME}.awg_i1="" uci set network.${INTERFACE_NAME}.nohostroute='1' uci set network.@${CONFIG_NAME}[-1].description="${INTERFACE_NAME}_peer" @@ -995,7 +969,7 @@ service odhcpd restart path_podkop_config="/etc/config/podkop" path_podkop_config_backup="/root/podkop" -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/beta_zapret" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/new_awg_podkop" messageComplete="" @@ -1082,7 +1056,7 @@ case $varByPass in esac PACKAGE="podkop" -REQUIRED_VERSION="v0.4.11-r1" +REQUIRED_VERSION="v0.5.6-r1" INSTALLED_VERSION=$(opkg list-installed | grep "^$PACKAGE" | cut -d ' ' -f 3) if [ -n "$INSTALLED_VERSION" ] && [ "$INSTALLED_VERSION" != "$REQUIRED_VERSION" ]; then @@ -1108,9 +1082,9 @@ else if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then DOWNLOAD_DIR="/tmp/podkop" mkdir -p "$DOWNLOAD_DIR" - podkop_files="podkop_v0.4.11-r1_all.ipk - luci-app-podkop_v0.4.11-r1_all.ipk - luci-i18n-podkop-ru_0.4.11.ipk" + podkop_files="podkop_v0.5.6-r1_all.ipk + luci-app-podkop_v0.5.6-r1_all.ipk + luci-i18n-podkop-ru_0.5.6.ipk" for file in $podkop_files do echo "Download $file..."