From 2c0e89b7ac7c5acc687c1fc98b2a8fb2674db071 Mon Sep 17 00:00:00 2001 From: kongfl888 Date: Wed, 17 Jun 2020 02:33:20 +0800 Subject: [PATCH 1/2] Create and pack MD5 verification file. --- .github/workflows/r1s_lean.yml | 3 +++ .github/workflows/r1s_lean_h3.yml | 3 +++ .github/workflows/r1s_lienol.yml | 3 +++ .github/workflows/r2s_lean.yml | 3 +++ .github/workflows/r2s_lean_minimal.yml | 3 +++ .github/workflows/r2s_lienol.yml | 3 +++ .github/workflows/r2s_lienol_from_lean.yml_ | 3 +++ .github/workflows/r2s_original.yml | 3 +++ 8 files changed, 24 insertions(+) diff --git a/.github/workflows/r1s_lean.yml b/.github/workflows/r1s_lean.yml index ce6e1a5..c09f1e4 100644 --- a/.github/workflows/r1s_lean.yml +++ b/.github/workflows/r1s_lean.yml @@ -127,6 +127,9 @@ jobs: mkdir -p ./artifact/ mv friendlywrt-h5/out/*img* ./artifact/ cp friendlywrt-h5/friendlywrt/.config ./artifact/ + cd ./artifact/ + md5sum *img* > md5sum.txt + cd .. zip -r artifact.zip ./artifact/ release_tag="R1S-Lean-$(date +%Y-%m-%d)" echo "##[set-output name=release_tag;]$release_tag" diff --git a/.github/workflows/r1s_lean_h3.yml b/.github/workflows/r1s_lean_h3.yml index 0fe8b88..cb82393 100644 --- a/.github/workflows/r1s_lean_h3.yml +++ b/.github/workflows/r1s_lean_h3.yml @@ -132,6 +132,9 @@ jobs: mkdir -p ./artifact/ mv friendlywrt-h3/out/*img* ./artifact/ cp friendlywrt-h3/friendlywrt/.config ./artifact/ + cd ./artifact/ + md5sum *img* > md5sum.txt + cd .. zip -r artifact.zip ./artifact/ release_tag="R1S-H3-$(date +%Y-%m-%d)" echo "##[set-output name=release_tag;]$release_tag" diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml index cddf7c4..71eb53f 100644 --- a/.github/workflows/r1s_lienol.yml +++ b/.github/workflows/r1s_lienol.yml @@ -120,6 +120,9 @@ jobs: mkdir -p ./artifact/ mv friendlywrt-h5/out/*img* ./artifact/ cp friendlywrt-h5/friendlywrt/.config ./artifact/ + cd ./artifact/ + md5sum *img* > md5sum.txt + cd .. zip -r artifact.zip ./artifact/ release_tag="R1S-Lienol-$(date +%Y-%m-%d)" echo "##[set-output name=release_tag;]$release_tag" diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index 120f196..34dd756 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -113,6 +113,9 @@ jobs: mkdir -p ./artifact/ mv friendlywrt-rk3328/out/*img* ./artifact/ cp friendlywrt-rk3328/friendlywrt/.config ./artifact/ + cd ./artifact/ + md5sum *img* > md5sum.txt + cd .. zip -r artifact.zip ./artifact/ release_tag="R2S-Lean-$(date +%Y-%m-%d)" echo "##[set-output name=release_tag;]$release_tag" diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index 537982f..d0742a3 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -199,6 +199,9 @@ jobs: mkdir -p ./artifact/ mv friendlywrt-rk3328/out/*img* ./artifact/ cp friendlywrt-rk3328/friendlywrt/.config ./artifact/ + cd ./artifact/ + md5sum *img* > md5sum.txt + cd .. zip -r artifact.zip ./artifact/ #release_tag="R2S-Lean-$(date +%Y-%m-%d)-Minimal" release_tag="R2S-Minimal-$(date +%Y-%m-%d)" diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml index 2a35279..36f60b1 100644 --- a/.github/workflows/r2s_lienol.yml +++ b/.github/workflows/r2s_lienol.yml @@ -98,6 +98,9 @@ jobs: mkdir -p ./artifact/ mv friendlywrt-rk3328/out/*img* ./artifact/ cp friendlywrt-rk3328/friendlywrt/.config ./artifact/ + cd ./artifact/ + md5sum *img* > md5sum.txt + cd .. zip -r artifact.zip ./artifact/ release_tag="R2S-Lienol-$(date +%Y-%m-%d)" echo "##[set-output name=release_tag;]$release_tag" diff --git a/.github/workflows/r2s_lienol_from_lean.yml_ b/.github/workflows/r2s_lienol_from_lean.yml_ index 2654c4f..ac43640 100644 --- a/.github/workflows/r2s_lienol_from_lean.yml_ +++ b/.github/workflows/r2s_lienol_from_lean.yml_ @@ -171,6 +171,9 @@ jobs: mkdir -p ./artifact/ mv friendlywrt-rk3328/out/*img* ./artifact/ cp friendlywrt-rk3328/friendlywrt/.config ./artifact/ + cd ./artifact/ + md5sum *img* > md5sum.txt + cd .. zip -r artifact.zip ./artifact/ release_tag="R2S-Minimal-$(date +%Y-%m-%d)" echo "##[set-output name=release_tag;]$release_tag" diff --git a/.github/workflows/r2s_original.yml b/.github/workflows/r2s_original.yml index a0edd38..2d35007 100644 --- a/.github/workflows/r2s_original.yml +++ b/.github/workflows/r2s_original.yml @@ -73,6 +73,9 @@ jobs: mkdir -p ./artifact/ mv friendlywrt-rk3328/out/*img* ./artifact/ cp friendlywrt-rk3328/friendlywrt/.config ./artifact/ + cd ./artifact/ + md5sum *img* > md5sum.txt + cd .. - name: Upload Artifact uses: actions/upload-artifact@master with: From 8a67f6585abddd07f73ad9ea5ad5670389ee310a Mon Sep 17 00:00:00 2001 From: kongfl888 Date: Wed, 17 Jun 2020 02:53:50 +0800 Subject: [PATCH 2/2] Update script: verify MD5 for file before upgrading. --- scripts/autoupdate-usb.sh | 6 ++++++ scripts/autoupdate.sh | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/scripts/autoupdate-usb.sh b/scripts/autoupdate-usb.sh index 99242e0..d0e12a9 100755 --- a/scripts/autoupdate-usb.sh +++ b/scripts/autoupdate-usb.sh @@ -20,6 +20,12 @@ fi unzip R2S*.zip rm R2S*.zip if [ -f /mnt/mmcblk0p2/artifact/FriendlyWrt*.img.gz ]; then + cd /mnt/mmcblk0p2/artifact/ + if [ `md5sum -c md5sum.txt|grep -c "OK"` -eq 0 ]; then + echo -e '\e[91m固件HASH值匹配失败，脚本退出\e[0m' + exit 1 + fi + cd /mnt/mmcblk0p2 pv /mnt/mmcblk0p2/artifact/FriendlyWrt*.img.gz | gunzip -dc > FriendlyWrt.img echo -e '\e[92m准备解压镜像文件\e[0m' fi diff --git a/scripts/autoupdate.sh b/scripts/autoupdate.sh index d17eb14..5d69528 100644 --- a/scripts/autoupdate.sh +++ b/scripts/autoupdate.sh @@ -18,6 +18,12 @@ fi unzip R2S*.zip rm R2S*.zip if [ -f /mnt/mmcblk0p2/artifact/FriendlyWrt*.img.gz ]; then + cd /mnt/mmcblk0p2/artifact/ + if [ `md5sum -c md5sum.txt|grep -c "OK"` -eq 0 ]; then + echo -e '\e[91m固件HASH值匹配失败，脚本退出\e[0m' + exit 1 + fi + cd /mnt/mmcblk0p2 pv /mnt/mmcblk0p2/artifact/FriendlyWrt*.img.gz | gunzip -dc > FriendlyWrt.img echo -e '\e[92m准备解压镜像文件\e[0m' fi