wok-current diff memtest/stuff/pack @ rev 19941
memtest: remove help command line, useless
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu May 04 12:47:15 2017 +0200 (2017-05-04) |
parents | e4d1fb5556df |
children | 9ca81337dc6e |
line diff
1.1 --- a/memtest/stuff/pack Wed Apr 19 22:14:58 2017 +0200 1.2 +++ b/memtest/stuff/pack Thu May 04 12:47:15 2017 +0200 1.3 @@ -17,7 +17,7 @@ 1.4 helpend=$(grep -s helpend$ ${1/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') 1.5 if [ -n "$helpmsg" ]; then 1.6 sed -i "s/YYY/$((0x$helpmsg))/" $0 1.7 - sed -i "s/ZZZ/$((0x$helpend-0x$helpmsg-1))/" $0 1.8 + sed -i "s/ZZZ/$((0x$helpend-0x$helpmsg))/" $0 1.9 else 1.10 sed -i '/YYY/d' $0 1.11 fi 1.12 @@ -49,24 +49,24 @@ 1.13 dd if=$1 bs=1 skip=497 seek=497 count=15 of=$2 conv=notrunc 1.14 setup="$(echo $(od -j 497 -N 1 -dAn $1))" 1.15 [ $setup -eq 0 ] && setup=4 1.16 - syssize="$(echo $(od -j 500 -N 2 -dAn $1))" 1.17 - [ $syssize -eq 0 ] && syssize=$((($(stat -c %s $1) + 15 - 512*($setup + 1))/16)) 1.18 store $setup $2 XXXSB 1 1.19 store $setup $2 XXXSW 1 1.20 store $((32 * $setup)) $2 XXXSP 1.21 store $((0x1000 - 32*$setup)) $2 XXXSS 1.22 dd if=$1 bs=512 skip=1 | compress >>$2 1.23 size=$(stat -c %s $2) 1.24 - store $((($size-2560+15)/16 + 0x1000)) $2 XXXP 1.25 - store $((($size-2560+15)/16)) $2 500 1.26 + syssize=$((($size-512*($setup+1)+15)/16)) 1.27 + store $(($syssize + 0x1000)) $2 XXXP 1.28 + store $syssize $2 500 1.29 store 4 $2 497 1 1.30 store $((($size+511)/512)) $2 4 1.31 + store $((($size+15)/16+0x9E0)) $2 10 1.32 store $((($size+15)/16)) $2 14 1.33 echo -e "$3" | dd conv=notrunc bs=1 seek=YYY of=$2 count=ZZZ 1.34 } 1.35 1.36 HELP="$(unix2dos <<EOT 1.37 -Memtest86+ VERSION GPL endless 1.38 +Memtest86+ VERSION GPLv2 1.39 EOT 1.40 )" 1.41 main $1 ${2:-$1.packed} "${3:-$HELP}" 2>/dev/null <<EOT