diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14aa8d8..0a6d868 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,6 @@ jobs: - name: Copy files from ${{ matrix.package_type }} Docker container run: | mkdir -p ./bin/${{ matrix.package_type }} - rm -f ./bin/${{ matrix.package_type }}/*.${{ matrix.package_type }} || true docker cp ${{ matrix.package_type }}:/builder/bin/packages/x86_64/utilites/. ./bin/${{ matrix.package_type }}/ docker cp ${{ matrix.package_type }}:/builder/bin/packages/x86_64/luci/. ./bin/${{ matrix.package_type }}/ diff --git a/Dockerfile-apk b/Dockerfile-apk index 1f1c2ce..4c9a885 100644 --- a/Dockerfile-apk +++ b/Dockerfile-apk @@ -1,4 +1,4 @@ -FROM itdoginfo/openwrt-sdk-apk:latest +FROM itdoginfo/openwrt-sdk-apk:09102025 ARG PKG_VERSION ENV PKG_VERSION=${PKG_VERSION} diff --git a/Dockerfile-ipk b/Dockerfile-ipk index 2f88f66..aaa109e 100644 --- a/Dockerfile-ipk +++ b/Dockerfile-ipk @@ -1,4 +1,4 @@ -FROM itdoginfo/openwrt-sdk-ipk:latest +FROM itdoginfo/openwrt-sdk-ipk:24.10.3 ARG PKG_VERSION ENV PKG_VERSION=${PKG_VERSION} diff --git a/install.sh b/install.sh index 66ce08f..c84051b 100755 --- a/install.sh +++ b/install.sh @@ -85,9 +85,9 @@ main() { local grep_url_pattern if [ "$PKG_IS_APK" -eq 1 ]; then - grep_url_pattern='https://[^"[:space:]]*\.ipk' - else grep_url_pattern='https://[^"[:space:]]*\.apk' + else + grep_url_pattern='https://[^"[:space:]]*\.ipk' fi download_success=0 @@ -133,8 +133,8 @@ main() { if [ -n "$ru" ]; then if pkg_is_installed luci-i18n-podkop-ru; then msg "Upgraded ru translation..." - pkg_remove remove luci-i18n-podkop* - pkg_install install "$DOWNLOAD_DIR/$ru" + pkg_remove luci-i18n-podkop* + pkg_install "$DOWNLOAD_DIR/$ru" else msg "Русский язык интерфейса ставим? y/n (Need a Russian translation?)" while true; do diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js index d0a9456..31db43d 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js @@ -1,4 +1,4 @@ -// This file is autogenerated, please don't change manually +// This file is autogenerated, please don't change manually "use strict"; "require baseclass"; "require fs"; @@ -1913,8 +1913,8 @@ return baseclass.extend({ FAKEIP_CHECK_DOMAIN, FETCH_TIMEOUT, IP_CHECK_DOMAIN, - REGIONAL_OPTIONS, PODKOP_LUCI_APP_VERSION, + REGIONAL_OPTIONS, STATUS_COLORS, TabService, TabServiceInstance,