diff --git a/.github/workflows/build-module.yml b/.github/workflows/build-module.yml index b261c5c..c8ec29c 100644 --- a/.github/workflows/build-module.yml +++ b/.github/workflows/build-module.yml @@ -123,6 +123,7 @@ jobs: echo "CONFIG_PACKAGE_kmod-amneziawg=m" > .config echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config echo "CONFIG_PACKAGE_luci-proto-amneziawg=y" >> .config + echo "CONFIG_PACKAGE_luci-i18n-amneziawg-ru=y" >> .config make defconfig @@ -150,7 +151,7 @@ jobs: make package/amneziawg-tools/compile V=s echo "Build completed. Checking for built packages..." - find bin/ -name "*.ipk" | grep -E "(amneziawg|luci-proto-amneziawg)" | head -10 + find bin/ -name "*.ipk" | grep -E "(amneziawg|luci-proto-amneziawg|luci-i18n-amneziawg)" | head -10 - name: Prepare artifacts run: | @@ -163,6 +164,7 @@ jobs: # Copy built packages find "$SDK_DIR/bin/packages" -name "amneziawg-tools_*.ipk" -exec cp {} awgrelease/amneziawg-tools_${postfix}.ipk \; || echo "amneziawg-tools package not found" find "$SDK_DIR/bin/packages" -name "luci-proto-amneziawg_*.ipk" -exec cp {} awgrelease/luci-proto-amneziawg_${postfix}.ipk \; || echo "luci-proto-amneziawg package not found" + find "$SDK_DIR/bin/packages" -name "luci-i18n-amneziawg-ru_*.ipk" -exec cp {} awgrelease/luci-i18n-amneziawg-ru_${postfix}.ipk \; || echo "luci-i18n-amneziawg-ru package not found" find "$SDK_DIR/bin/targets" -name "kmod-amneziawg_*.ipk" -exec cp {} awgrelease/kmod-amneziawg_${postfix}.ipk \; || echo "kmod-amneziawg package not found" echo "Built packages:" diff --git a/amneziawg-install.sh b/amneziawg-install.sh index 0db62a1..efba7f8 100644 --- a/amneziawg-install.sh +++ b/amneziawg-install.sh @@ -38,7 +38,7 @@ install_awg_packages() { opkg install "$AWG_DIR/$KMOD_AMNEZIAWG_FILENAME" if [ $? -eq 0 ]; then - echo "kmod-amneziawg file downloaded successfully" + echo "kmod-amneziawg installed successfully" else echo "Error installing kmod-amneziawg. Please, install kmod-amneziawg manually and run the script again" exit 1 @@ -62,7 +62,7 @@ install_awg_packages() { opkg install "$AWG_DIR/$AMNEZIAWG_TOOLS_FILENAME" if [ $? -eq 0 ]; then - echo "amneziawg-tools file downloaded successfully" + echo "amneziawg-tools installed successfully" else echo "Error installing amneziawg-tools. Please, install amneziawg-tools manually and run the script again" exit 1 @@ -86,13 +86,42 @@ install_awg_packages() { opkg install "$AWG_DIR/$LUCI_APP_AMNEZIAWG_FILENAME" if [ $? -eq 0 ]; then - echo "luci-proto-amneziawg file downloaded successfully" + echo "luci-proto-amneziawg installed successfully" else echo "Error installing luci-proto-amneziawg. Please, install luci-proto-amneziawg manually and run the script again" exit 1 fi fi + # Ask about Russian localization + printf "\033[32;1mУстанавливаем пакет с русской локализацией? Install Russian language pack? (y/n) [n]: \033[0m\n" + read INSTALL_RU_LANG + INSTALL_RU_LANG=${INSTALL_RU_LANG:-n} + + if [ "$INSTALL_RU_LANG" = "y" ] || [ "$INSTALL_RU_LANG" = "Y" ]; then + if opkg list-installed | grep -q luci-i18n-amneziawg-ru; then + echo "luci-i18n-amneziawg-ru already installed" + else + LUCI_I18N_AMNEZIAWG_RU_FILENAME="luci-i18n-amneziawg-ru${PKGPOSTFIX}" + DOWNLOAD_URL="${BASE_URL}v${VERSION}/${LUCI_I18N_AMNEZIAWG_RU_FILENAME}" + wget -O "$AWG_DIR/$LUCI_I18N_AMNEZIAWG_RU_FILENAME" "$DOWNLOAD_URL" + + if [ $? -eq 0 ]; then + echo "luci-i18n-amneziawg-ru file downloaded successfully" + opkg install "$AWG_DIR/$LUCI_I18N_AMNEZIAWG_RU_FILENAME" + if [ $? -eq 0 ]; then + echo "luci-i18n-amneziawg-ru installed successfully" + else + echo "Warning: Error installing luci-i18n-amneziawg-ru (non-critical)" + fi + else + echo "Warning: Russian localization not available for this version/platform (non-critical)" + fi + fi + else + printf "\033[32;1mSkipping Russian language pack installation.\033[0m\n" + fi + rm -rf "$AWG_DIR" }