Mirror/RouterichAX3000_configs
1
0
Fork 0
mirror of https://github.com/routerich/RouterichAX3000_configs.git synced 2026-01-27 04:30:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from routerich/beta

Browse Source 
Merge beta in main
This commit is contained in:
CodeRoK7
2025-03-14 21:53:00 +05:00
committed by GitHub
parent d4239f618c 8d1ea38e63
commit 6189321512
2 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
awg_config.sh
View File

@@ -281,17 +281,18 @@ checkAndAddDomainPermanentName()
fi fi
} }
echo "Update list packages..."
opkg update
checkPackageAndInstall "coreutils-base64" "1"
encoded_code="IyEvYmluL3NoCgojINCn0YLQtdC90LjQtSDQvNC+0LTQtdC70Lgg0LjQtyDRhNCw0LnQu9CwCm1vZGVsPSQoY2F0IC90bXAvc3lzaW5mby9tb2RlbCkKCiMg0J/RgNC+0LLQtdGA0LrQsCwg0YHQvtC00LXRgNC20LjRgiDQu9C4INC80L7QtNC10LvRjCDRgdC70L7QstC+ICJSb3V0ZXJpY2giCmlmICEgZWNobyAiJG1vZGVsIiB8IGdyZXAgLXEgIlJvdXRlcmljaCI7IHRoZW4KICAgIGVjaG8gIlRoaXMgc2NyaXB0IGZvciByb3V0ZXJzIFJvdXRlcmljaC4uLiBJZiB5b3Ugd2FudCB0byB1c2UgaXQsIHdyaXRlIHRvIHRoZSBlcCBjaGF0IFRHIEByb3V0ZXJpY2giCiAgICBleGl0IDEKZmk=" encoded_code="IyEvYmluL3NoCgojINCn0YLQtdC90LjQtSDQvNC+0LTQtdC70Lgg0LjQtyDRhNCw0LnQu9CwCm1vZGVsPSQoY2F0IC90bXAvc3lzaW5mby9tb2RlbCkKCiMg0J/RgNC+0LLQtdGA0LrQsCwg0YHQvtC00LXRgNC20LjRgiDQu9C4INC80L7QtNC10LvRjCDRgdC70L7QstC+ICJSb3V0ZXJpY2giCmlmICEgZWNobyAiJG1vZGVsIiB8IGdyZXAgLXEgIlJvdXRlcmljaCI7IHRoZW4KICAgIGVjaG8gIlRoaXMgc2NyaXB0IGZvciByb3V0ZXJzIFJvdXRlcmljaC4uLiBJZiB5b3Ugd2FudCB0byB1c2UgaXQsIHdyaXRlIHRvIHRoZSBlcCBjaGF0IFRHIEByb3V0ZXJpY2giCiAgICBleGl0IDEKZmk="
eval "$(echo "$encoded_code" | base64 --decode)" eval "$(echo "$encoded_code" | base64 --decode)"
echo "opkg update"
opkg update
#проверка и установка пакетов AmneziaWG #проверка и установка пакетов AmneziaWG
install_awg_packages install_awg_packages
checkPackageAndInstall "jq" "1" checkPackageAndInstall "jq" "1"
checkPackageAndInstall "coreutils-base64" "1"
checkPackageAndInstall "curl" "1" checkPackageAndInstall "curl" "1"
#проверяем установлени ли пакет dnsmasq-full #проверяем установлени ли пакет dnsmasq-full
@@ -305,16 +306,9 @@ else
[ -f /etc/config/dhcp-opkg ] && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp [ -f /etc/config/dhcp-opkg ] && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp
fi fi
openwrt_release=$(cat /etc/openwrt_release | grep -Eo [0-9]{2}[.][0-9]{2}[.][0-9]* | cut -d '.' -f 1 | tail -n 1) printf "Setting confdir dnsmasq"
if [ $openwrt_release -ge 24 ]; then uci set dhcp.@dnsmasq[0].confdir='/tmp/dnsmasq.d'
if uci get dhcp.@dnsmasq[0].confdir | grep -q /tmp/dnsmasq.d; then uci commit dhcp
echo "confdir alreadt set"
else
printf "Setting confdir"
uci set dhcp.@dnsmasq[0].confdir='/tmp/dnsmasq.d'
uci commit dhcp
fi
fi
DIR="/etc/config" DIR="/etc/config"
DIR_BACKUP="/root/backup2" DIR_BACKUP="/root/backup2"

53
configure_zaprets.sh
View File

@@ -142,34 +142,41 @@ install_youtubeunblock_packages() {
rm -rf "$AWG_DIR" rm -rf "$AWG_DIR"
} }
encoded_code="IyEvYmluL3NoCgojINCn0YLQtdC90LjQtSDQvNC+0LTQtdC70Lgg0LjQtyDRhNCw0LnQu9CwCm1vZGVsPSQoY2F0IC90bXAvc3lzaW5mby9tb2RlbCkKCiMg0J/RgNC+0LLQtdGA0LrQsCwg0YHQvtC00LXRgNC20LjRgiDQu9C4INC80L7QtNC10LvRjCDRgdC70L7QstC+ICJSb3V0ZXJpY2giCmlmICEgZWNobyAiJG1vZGVsIiB8IGdyZXAgLXEgIlJvdXRlcmljaCI7IHRoZW4KICAgIGVjaG8gIlRoaXMgc2NyaXB0IGZvciByb3V0ZXJzIFJvdXRlcmljaC4uLiBJZiB5b3Ugd2FudCB0byB1c2UgaXQsIHdyaXRlIHRvIHRoZSBlcCBjaGF0IFRHIEByb3V0ZXJpY2giCiAgICBleGl0IDEKZmk=" checkPackageAndInstall()
eval "$(echo "$encoded_code" | base64 --decode)" {
local name="$1"
local isRequried="$2"
#проверяем установлени ли библиотека $name
if opkg list-installed | grep -q $name; then
echo "$name already installed..."
else
echo "$name not installed. Installed $name..."
opkg install $name
res=$?
if [ "$isRequried" = "1" ]; then
if [ $res -eq 0 ]; then
echo "$name insalled successfully"
else
echo "Error installing $name. Please, install $name manually and run the script again"
exit 1
fi
fi
fi
}
echo "Upgrade packages..." echo "Update list packages..."
opkg update opkg update
checkPackageAndInstall "coreutils-base64" "1"
encoded_code="IyEvYmluL3NoCgojINCn0YLQtdC90LjQtSDQvNC+0LTQtdC70Lgg0LjQtyDRhNCw0LnQu9CwCm1vZGVsPSQoY2F0IC90bXAvc3lzaW5mby9tb2RlbCkKCiMg0J/RgNC+0LLQtdGA0LrQsCwg0YHQvtC00LXRgNC20LjRgiDQu9C4INC80L7QtNC10LvRjCDRgdC70L7QstC+ICJSb3V0ZXJpY2giCmlmICEgZWNobyAiJG1vZGVsIiB8IGdyZXAgLXEgIlJvdXRlcmljaCI7IHRoZW4KICAgIGVjaG8gIlRoaXMgc2NyaXB0IGZvciByb3V0ZXJzIFJvdXRlcmljaC4uLiBJZiB5b3Ugd2FudCB0byB1c2UgaXQsIHdyaXRlIHRvIHRoZSBlcCBjaGF0IFRHIEByb3V0ZXJpY2giCiAgICBleGl0IDEKZmk="
eval "$(echo "$encoded_code" | base64 --decode)"
#проверяем установлени ли библиотека https-dns-proxy #проверяем установлени ли библиотека https-dns-proxy
if opkg list-installed | grep -q https-dns-proxy; then checkPackageAndInstall "https-dns-proxy" "1"
echo "https-dns-proxy already installed..." checkPackageAndInstall "luci-app-https-dns-proxy" "0"
else checkPackageAndInstall "luci-i18n-https-dns-proxy-ru" "0"
echo "https-dns-proxy not installed. Installed https-dns-proxy..."
opkg install https-dns-proxy
if [ $? -eq 0 ]; then
echo "https-dns-proxy file installed successfully"
else
echo "Error installing https-dns-proxy. Please, install https-dns-proxy manually and run the script again"
exit 1
fi
fi
if ! opkg list-installed | grep -q luci-app-https-dns-proxy; then
opkg install luci-app-https-dns-proxy
fi
if ! opkg list-installed | grep -q luci-i18n-https-dns-proxy-ru; then
opkg install luci-i18n-https-dns-proxy-ru
fi
install_youtubeunblock_packages install_youtubeunblock_packages