update 2023-12-19 20:09:13

luci-app-amlogic/Makefile

@@ -16,7 +16,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-amlogic
-PKG_VERSION:=3.1.215
+PKG_VERSION:=3.1.217
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0 License

luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_config.lua

@@ -89,10 +89,4 @@ shared_fstype:value("xfs", translate("xfs"))
 shared_fstype.default = "ext4"
 shared_fstype.rmempty = false
 
---10.Set the github proxy
-github_proxy = o:option(Value, "amlogic_github_proxy", translate("Set the github proxy:"))
-github_proxy.description = translate("[Default ''] Set up a github.com proxy for faster firmware and kernel downloads.")
-github_proxy.default = ""
-github_proxy.rmempty = false
-
 return b

luci-app-amlogic/po/zh-cn/amlogic.po

@@ -416,12 +416,6 @@ msgstr "设置文件系统类型："
 msgid "[Default ext4] Set the file system type of the shared partition (/mnt/mmcblk*p4) when install OpenWrt."
 msgstr "[默认 ext4] 设置安装 OpenWrt 时共享分区 (/mnt/mmcblk*p4) 的文件系统类型。"
 
-msgid "Set the proxy:"
-msgstr "设置代理:"
-
-msgid "[Default ''] Set up a github.com proxy for faster firmware and kernel downloads."
-msgstr "[默认 ''] 设置 github.com 代理以加快固件和内核下载速度。"
-
 msgid "Save Config:"
 msgstr "保存配置："
 

luci-app-amlogic/root/etc/config/amlogic

@@ -9,7 +9,6 @@ config amlogic 'config'
 	option amlogic_firmware_config '1'
 	option amlogic_write_bootloader '0'
 	option amlogic_shared_fstype 'ext4'
-	option amlogic_github_proxy ''
 
 config settings 'armcpu'
 	option governor0 'schedutil'

luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh

@@ -116,7 +116,6 @@ if [[ "${server_kernel_branch}" != "${main_line_version}" ]]; then
     tolog "01.02 Select branch: ${main_line_version}"
     sleep 2
 fi
-github_proxy="$(uci get amlogic.config.amlogic_github_proxy 2>/dev/null)"
 
 # 01.03. Download server version documentation
 server_firmware_url="$(uci get amlogic.config.amlogic_firmware_repo 2>/dev/null)"
@@ -256,12 +255,7 @@ download_firmware() {
     opfile_path="$(echo ${download_version} | awk -F'@' '{print $2}')"
     # Restore converted characters in file names(%2B to +)
     firmware_download_oldname="${opfile_path//%2B/+}"
-
-    if [[ -n "${github_proxy}" ]]; then
-        latest_url="${github_proxy}/https://github.com/${server_firmware_url}/releases/download/${firmware_download_oldname}"
-    else
-        latest_url="https://github.com/${server_firmware_url}/releases/download/${firmware_download_oldname}"
-    fi
+    latest_url="https://github.com/${server_firmware_url}/releases/download/${firmware_download_oldname}"
 
     # Download to OpenWrt file
     firmware_download_name="openwrt_${BOARD}_k${main_line_version}_github${firmware_suffix}"

luci-app-amlogic/root/usr/share/amlogic/amlogic_check_kernel.sh

@@ -103,9 +103,6 @@ if [[ "${kernel_repo}" == "opt/kernel" ]]; then
     kernel_repo="${firmware_repo}"
 fi
 
-github_proxy="$(uci get amlogic.config.amlogic_github_proxy 2>/dev/null)"
-
-
 # Convert kernel repo to api format
 [[ "${kernel_repo}" =~ ^https: ]] && kernel_repo="$(echo ${kernel_repo} | awk -F'/' '{print $4"/"$5}')"
 kernel_api="https://github.com/${kernel_repo}"
@@ -180,12 +177,8 @@ download_kernel() {
     rm -f ${KERNEL_DOWNLOAD_PATH}/sha256sums
     rm -rf ${KERNEL_DOWNLOAD_PATH}/${download_version}*
 
-    if [[ -n "${github_proxy}" ]]; then
-        kernel_down_from="${kernel_repo}/https://github.com/${kernel_repo}/releases/download/kernel_${kernel_tag}/${download_version}.tar.gz"
-    else
-        kernel_down_from="https://github.com/${kernel_repo}/releases/download/kernel_${kernel_tag}/${download_version}.tar.gz"
-    fi
-    
+    kernel_down_from="https://github.com/${kernel_repo}/releases/download/kernel_${kernel_tag}/${download_version}.tar.gz"
+
     curl -fsSL "${kernel_down_from}" -o ${KERNEL_DOWNLOAD_PATH}/${download_version}.tar.gz
     [[ "${?}" -ne "0" ]] && tolog "03.03 The kernel download failed." "1"
 

luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh

@@ -87,8 +87,6 @@ if [[ -z "${PLATFORM}" || -z "$(echo "${support_platform[@]}" | grep -w "${PLATF
     tolog "Missing [ PLATFORM ] value in ${AMLOGIC_SOC_FILE} file." "1"
 fi
 
-github_proxy="$(uci get amlogic.config.amlogic_github_proxy 2>/dev/null)"
-
 tolog "PLATFORM: [ ${PLATFORM} ], SOC: [ ${SOC} ], Use in [ ${EMMC_NAME} ]"
 sleep 2
 
@@ -123,11 +121,7 @@ else
     tolog "02.03 Start downloading the latest plugin..."
 
     # Set the plugin download path
-    if [[ -n "${github_proxy}" ]]; then
-        download_repo="${github_proxy}/https://github.com/ophub/luci-app-amlogic/releases/download"
-    else
-        download_repo="https://github.com/ophub/luci-app-amlogic/releases/download"
-    fi
+    download_repo="https://github.com/ophub/luci-app-amlogic/releases/download"
 
     plugin_file="${download_repo}/${latest_version}/luci-app-amlogic_${latest_version}_all.ipk"
     language_file="${download_repo}/${latest_version}/luci-i18n-amlogic-zh-cn_${latest_version}_all.ipk"