fix: Minor changes and bugfixes, ci fix

This commit is contained in:
SaltyMonkey
2025-10-09 00:56:15 +03:00
parent b5cfc017fe
commit 826245a89a
5 changed files with 8 additions and 9 deletions

View File

@@ -51,7 +51,6 @@ jobs:
- name: Copy files from ${{ matrix.package_type }} Docker container - name: Copy files from ${{ matrix.package_type }} Docker container
run: | run: |
mkdir -p ./bin/${{ matrix.package_type }} 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/utilites/. ./bin/${{ matrix.package_type }}/
docker cp ${{ matrix.package_type }}:/builder/bin/packages/x86_64/luci/. ./bin/${{ matrix.package_type }}/ docker cp ${{ matrix.package_type }}:/builder/bin/packages/x86_64/luci/. ./bin/${{ matrix.package_type }}/

View File

@@ -1,4 +1,4 @@
FROM itdoginfo/openwrt-sdk-apk:latest FROM itdoginfo/openwrt-sdk-apk:09102025
ARG PKG_VERSION ARG PKG_VERSION
ENV PKG_VERSION=${PKG_VERSION} ENV PKG_VERSION=${PKG_VERSION}

View File

@@ -1,4 +1,4 @@
FROM itdoginfo/openwrt-sdk-ipk:latest FROM itdoginfo/openwrt-sdk-ipk:24.10.3
ARG PKG_VERSION ARG PKG_VERSION
ENV PKG_VERSION=${PKG_VERSION} ENV PKG_VERSION=${PKG_VERSION}

View File

@@ -85,9 +85,9 @@ main() {
local grep_url_pattern local grep_url_pattern
if [ "$PKG_IS_APK" -eq 1 ]; then if [ "$PKG_IS_APK" -eq 1 ]; then
grep_url_pattern='https://[^"[:space:]]*\.ipk'
else
grep_url_pattern='https://[^"[:space:]]*\.apk' grep_url_pattern='https://[^"[:space:]]*\.apk'
else
grep_url_pattern='https://[^"[:space:]]*\.ipk'
fi fi
download_success=0 download_success=0
@@ -133,8 +133,8 @@ main() {
if [ -n "$ru" ]; then if [ -n "$ru" ]; then
if pkg_is_installed luci-i18n-podkop-ru; then if pkg_is_installed luci-i18n-podkop-ru; then
msg "Upgraded ru translation..." msg "Upgraded ru translation..."
pkg_remove remove luci-i18n-podkop* pkg_remove luci-i18n-podkop*
pkg_install install "$DOWNLOAD_DIR/$ru" pkg_install "$DOWNLOAD_DIR/$ru"
else else
msg "Русский язык интерфейса ставим? y/n (Need a Russian translation?)" msg "Русский язык интерфейса ставим? y/n (Need a Russian translation?)"
while true; do while true; do

View File

@@ -1913,8 +1913,8 @@ return baseclass.extend({
FAKEIP_CHECK_DOMAIN, FAKEIP_CHECK_DOMAIN,
FETCH_TIMEOUT, FETCH_TIMEOUT,
IP_CHECK_DOMAIN, IP_CHECK_DOMAIN,
REGIONAL_OPTIONS,
PODKOP_LUCI_APP_VERSION, PODKOP_LUCI_APP_VERSION,
REGIONAL_OPTIONS,
STATUS_COLORS, STATUS_COLORS,
TabService, TabService,
TabServiceInstance, TabServiceInstance,