diff --git a/scripts/autoupdate-bash.sh b/scripts/autoupdate-bash.sh index af864c4..3e447f9 100644 --- a/scripts/autoupdate-bash.sh +++ b/scripts/autoupdate-bash.sh @@ -12,11 +12,11 @@ proceed_command sfdisk proceed_command losetup proceed_command resize2fs opkg install coreutils-truncate || true -wget -P /tmp https://ghproxy.com/https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/truncate -wget -P /tmp https://ghproxy.com/https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/ddnz +wget -NP /tmp https://ghproxy.com/https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/truncate +wget -NP /tmp https://ghproxy.com/https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/ddnz chmod +x /tmp/truncate /tmp/ddnz -board_id=$(cat /etc/board.json | jsonfilter -e '@["model"].id' | sed 's/friendly.*,nanopi-//;s/xunlong,orangepi-//;s/^r1s-h5$/r1s/;s/^r1$/r1s-h3/;s/^r1-plus$/r1p/') +board_id=$(cat /etc/board.json | jsonfilter -e '@["model"].id' | sed 's/friendly.*,nanopi-//;s/xunlong,orangepi-//;s/^r1s-h5$/r1s/;s/^r1$/r1s-h3/;s/^r1-plus$/r1p/;s/default-string-default-string/x86/') mount -t tmpfs -o remount,size=850m tmpfs /tmp rm -rf /tmp/upg && mkdir /tmp/upg && cd /tmp/upg @@ -43,8 +43,8 @@ if [ $md5r != $md5sum ]; then fi mv $board_id.img FriendlyWrt.img - -bs=`expr $(cat /sys/block/mmcblk0/size) \* 512` +[ $board_id = 'x86' ] && drive='sda' || device='mmcblk0' +bs=`expr $(cat /sys/block/$drive/size) \* 512` truncate -s $bs FriendlyWrt.img || ../truncate -s $bs FriendlyWrt.img echo ", +" | sfdisk -N 2 FriendlyWrt.img @@ -79,7 +79,7 @@ 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/mmcblk0 conv=sparse status=progress + dd if=FriendlyWrt.img of=/dev/$drive conv=sparse status=progress echo -e '\e[92m刷机完毕,正在重启...\e[0m' echo b > /proc/sysrq-trigger fi diff --git a/scripts/autoupdate.sh b/scripts/autoupdate.sh index 68874f7..438178e 100644 --- a/scripts/autoupdate.sh +++ b/scripts/autoupdate.sh @@ -12,11 +12,11 @@ proceed_command sfdisk proceed_command losetup proceed_command resize2fs opkg install coreutils-truncate || true -wget -P /tmp https://ghproxy.com/https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/truncate -wget -P /tmp https://ghproxy.com/https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/ddnz +wget -NP /tmp https://ghproxy.com/https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/truncate +wget -NP /tmp https://ghproxy.com/https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/ddnz chmod +x /tmp/truncate /tmp/ddnz -board_id=$(cat /etc/board.json | jsonfilter -e '@["model"].id' | sed 's/friendly.*,nanopi-//;s/xunlong,orangepi-//;s/^r1s-h5$/r1s/;s/^r1$/r1s-h3/;s/^r1-plus$/r1p/') +board_id=$(cat /etc/board.json | jsonfilter -e '@["model"].id' | sed 's/friendly.*,nanopi-//;s/xunlong,orangepi-//;s/^r1s-h5$/r1s/;s/^r1$/r1s-h3/;s/^r1-plus$/r1p/;s/default-string-default-string/x86/') mount -t tmpfs -o remount,size=850m tmpfs /tmp rm -rf /tmp/upg && mkdir /tmp/upg && cd /tmp/upg set +e