=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.2 retrieving revision 1.4 diff -u -r1.2 -r1.4 --- openbsd/fw_update/fw_install.sh 2021/10/05 01:39:05 1.2 +++ openbsd/fw_update/fw_install.sh 2021/10/05 01:49:17 1.4 @@ -28,9 +28,11 @@ last='' ftp -D "Detecting" -Vmo- $PATTERNS | while read d m; do + grep=fgrep [ "$last" = "$d" ] && continue [ "$m" ] || m="^$d[0-9][0-9]* at " - grep -q "$m" /var/run/dmesg.boot || continue + [ "$m" != "${m#^}" ] && grep=grep + $grep -q "$m" /var/run/dmesg.boot || continue echo $d last=$d done @@ -113,7 +115,7 @@ tar -zxphf "$firmware" -C /etc "firmware/*" mkdir -p ${PKGDIR}/${firmware%.tgz}/ tar -zxphf "$firmware" -C "${PKGDIR}/${firmware%.tgz}" "+*" - ed -s "${PKGDIR}/${firmware%.tgz}/+CONTENTS" <