From 1bddd11e72c7536782305551c26806a220585163 Mon Sep 17 00:00:00 2001 From: Liangbin Lian Date: Tue, 14 May 2024 10:55:26 +0800 Subject: [PATCH] istoreos/ota: fix cancel downloading task ``` fcurl --connect-timeout 5 --progress-bar -o /tmp/firmware.img.part "$OTA_URL_BASE/$img" 2>/tmp/firmware.img.progress & local pid="$!" ``` if we don't use alias, the pid will point to sub shell, not curl. on canceling, kill signal should send to curl. --- package/diy/luci-app-ota/Makefile | 2 +- package/diy/luci-app-ota/root/bin/ota | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/diy/luci-app-ota/Makefile b/package/diy/luci-app-ota/Makefile index 2f2df5ad04..0cf74cc487 100644 --- a/package/diy/luci-app-ota/Makefile +++ b/package/diy/luci-app-ota/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI for OTA upgrade LUCI_PKGARCH:=all -PKG_VERSION:=1.3.1 +PKG_VERSION:=1.3.2 PKG_RELEASE:=1 PKG_MAINTAINER:=jjm2473 diff --git a/package/diy/luci-app-ota/root/bin/ota b/package/diy/luci-app-ota/root/bin/ota index d62213a9c4..413dd50147 100755 --- a/package/diy/luci-app-ota/root/bin/ota +++ b/package/diy/luci-app-ota/root/bin/ota @@ -19,9 +19,7 @@ sha256() { sha256sum $1 | cut -d' ' -f1 } -fcurl() { - curl -L --fail --show-error "$@" -} +alias fcurl='curl -L --fail --show-error' download() { local img=$1