From 0a5c1824734d12b559da775fe0cecf9ab5f54e1c Mon Sep 17 00:00:00 2001
From: John Doe <klever1988@protonmail.com>
Date: Mon, 25 Oct 2021 20:01:11 +0800
Subject: [PATCH] autoupdate: fix

---
 scripts/autoupdate-bash.sh    |  9 +++++----
 scripts/autoupdate-offline.sh | 10 +++++-----
 scripts/autoupdate.sh         |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/scripts/autoupdate-bash.sh b/scripts/autoupdate-bash.sh
index f3a8d4d..ef9c9c0 100644
--- a/scripts/autoupdate-bash.sh
+++ b/scripts/autoupdate-bash.sh
@@ -40,8 +40,10 @@ if [ $md5r != $md5sum ]; then
 fi
 
 mv $board_id.img FriendlyWrt.img
-[ $board_id == 'x86' ] && drive='sda' || drive='mmcblk0'
-bs=`expr $(cat /sys/block/$drive/size) \* 512`
+block_device='mmcblk0'
+[ ! -d /sys/block/$block_device ] && block_device='mmcblk1'
+[ $board_id = 'x86' ] && block_device='sda'
+bs=`expr $(cat /sys/block/$block_device/size) \* 512`
 truncate -s $bs FriendlyWrt.img || ../truncate -s $bs FriendlyWrt.img
 echo ", +" | sfdisk -N 2 FriendlyWrt.img
 
@@ -78,8 +80,7 @@ echo -e '\e[92m开始写入，请勿中断...\e[0m'
 if [ -f FriendlyWrt.img ]; then
 	echo 1 > /proc/sys/kernel/sysrq
 	echo u > /proc/sysrq-trigger && umount / || true
-	#pv FriendlyWrt.img | dd of=/dev/mmcblk0 conv=fsync
-	dd if=FriendlyWrt.img of=/dev/$drive oflag=direct conv=sparse status=progress bs=1M
+	dd if=FriendlyWrt.img of=/dev/$block_device oflag=direct conv=sparse status=progress bs=1M
 	echo -e '\e[92m刷机完毕，正在重启...\e[0m'
 	echo b > /proc/sysrq-trigger
 fi
diff --git a/scripts/autoupdate-offline.sh b/scripts/autoupdate-offline.sh
index d0e12a9..6da69c8 100644
--- a/scripts/autoupdate-offline.sh
+++ b/scripts/autoupdate-offline.sh
@@ -20,12 +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'
+	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
+	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 707e6cd..5b3540b 100644
--- a/scripts/autoupdate.sh
+++ b/scripts/autoupdate.sh
@@ -45,6 +45,7 @@ fi
 
 mv $board_id.img FriendlyWrt.img
 block_device='mmcblk0'
+[ ! -d /sys/block/$block_device ] && block_device='mmcblk1'
 [ $board_id = 'x86' ] && block_device='sda'
 bs=`expr $(cat /sys/block/$block_device/size) \* 512`
 truncate -s $bs FriendlyWrt.img || ../truncate -s $bs FriendlyWrt.img