jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fwupdate: use curl instead of wget to download updates

Browse Source
This commit is contained in:
Calin Crisan 2017-02-20 22:31:30 +02:00
parent 5e1085000d
commit f98b6b9eac
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
board/common/overlay/sbin/fwupdate
View File

@ -14,7 +14,7 @@ function exit_usage() {
echo "" echo ""
echo "Statuses:" echo "Statuses:"
echo " idle" echo " idle"
echo " downloading <version>: <percent>%" echo " downloading <version>"
echo " downloaded <version>" echo " downloaded <version>"
echo " extracting <version>" echo " extracting <version>"
echo " extracted <version>" echo " extracted <version>"
@ -46,8 +46,8 @@ FW_DIR=/data/.fwupdate
FW_FILE=firmware.img.gz FW_FILE=firmware.img.gz
FW_FILE_EXTR=firmware.img FW_FILE_EXTR=firmware.img
WGET_LOG_FILE=wget.log CURL_LOG_FILE=curl.log
WGET_PID_FILE=wget.pid CURL_PID_FILE=curl.pid
GUNZIP_LOG_FILE=gunzip.log GUNZIP_LOG_FILE=gunzip.log
GUNZIP_PID_FILE=gunzip.pid GUNZIP_PID_FILE=gunzip.pid
@ -130,28 +130,26 @@ function do_download() {
mkdir -p $FW_DIR mkdir -p $FW_DIR
echo $version > $FW_DIR/$VER_FILE echo $version > $FW_DIR/$VER_FILE
wget --no-check-certificate -O $FW_DIR/$FW_FILE --quiet --show-progress --progress=dot "$url" &> $FW_DIR/$WGET_LOG_FILE & curl_opts="-S -f -L"
if [ -n "$os_firmware_username" ]; then
curl_opts+=" --user $os_firmware_username:$os_firmware_password"
fi
curl $curl_opts -o $FW_DIR/$FW_FILE "$url" &> $FW_DIR/$CURL_LOG_FILE &
pid=$! pid=$!
echo $pid > $FW_DIR/$WGET_PID_FILE echo $pid > $FW_DIR/$CURL_PID_FILE
wait $pid wait $pid
} }
function download_status() { function download_status() {
if [ -f $FW_DIR/$WGET_PID_FILE ]; then if [ -f $FW_DIR/$CURL_PID_FILE ]; then
pid=$(cat $FW_DIR/$WGET_PID_FILE) pid=$(cat $FW_DIR/$CURL_PID_FILE)
if kill -0 $pid &>/dev/null; then if kill -0 $pid &>/dev/null; then
progress=$(tail -n2 $FW_DIR/$WGET_LOG_FILE | grep -oe '[[:digit:]]*%') echo "running"
if [ -z "$progress" ]; then
progress="0%"
fi
progress=($progress)
echo ${progress[0]}
return return
fi fi
fi fi
if [ -f $FW_DIR/$FW_FILE ]; then if [ -f $FW_DIR/$FW_FILE ]; then
echo "done" echo "done"
fi fi
@ -326,11 +324,11 @@ function show_status() {
fi fi
status=$(download_status) status=$(download_status)
if [ "$status" == "done" ]; then if [ "$status" == "running" ]; then
echo "downloaded $(new_version)" echo "downloading $(new_version)"
return return
elif [ -n "$status" ]; then elif [ -n "$status" ]; then
echo "downloading $(new_version): $status" echo "downloaded $(new_version)"
return return
fi fi