=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.75 retrieving revision 1.78 diff -u -r1.75 -r1.78 --- openbsd/update_openbsd/update_openbsd 2015/05/03 00:27:01 1.75 +++ openbsd/update_openbsd/update_openbsd 2015/10/12 00:35:14 1.78 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.74 2015/03/21 22:50:18 andrew Exp $ +# $AFresh1: update_openbsd,v 1.77 2015/05/03 00:11:52 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -257,9 +257,7 @@ local _file=$1 # This could go circular, but I dunno how to fix that. if [ -h $_file ]; then - follow_symlink $( file $_file | - grep 'symbolic link' | - sed -e s/^.*\\\`// -e s/\\\'\$// ) + follow_symlink $( readlink -f $_file ) else echo $_file fi @@ -585,7 +583,7 @@ echo "!!! at the end of the proces but it is safer to !!!" >&2 echo "!!! have a separate root shell open. !!!" >&2 echo "!!! It is needed in order to run /sbin/oreboot. !!!" >&2 - echo "!!! sudo MAY NOT WORK after sets are extracted. !!!" >&2 + echo "!!! doas MAY NOT WORK after sets are extracted. !!!" >&2 echo >&2 echo "enter to continue, ctrl+C to cancel" >&2 local _temp @@ -613,8 +611,14 @@ fi update_etc - echo '==> UPDATING PACKAGES' - pkg_add -ui -F update -F updatedepends + OPENUP=$( which openup ) + if [ -n "$OPENUP" ]; then + echo "==> UPDATING WITH $OPENUP" + $OPENUP + else + echo '==> UPDATING PACKAGES' + pkg_add -ui -F update -F updatedepends + fi echo '==> UPDATING FIRMWARE' fw_update