diff options
| author |   rpe <rpe@openbsd.org> | 2016-12-19 18:52:54 +0000 |
|---|---|---|
| committer | rpe <rpe@openbsd.org> | 2016-12-19 18:52:54 +0000 |
| commit | d76d0d30106bdbe99676a42177e476bfc410593e (patch) | |
| tree | 044096c666d33d45681b99a670885f345943e090 | |
| parent | A couple more unused variables. (diff) | |
| download | wireguard-openbsd-d76d0d30106bdbe99676a42177e476bfc410593e.tar.xz wireguard-openbsd-d76d0d30106bdbe99676a42177e476bfc410593e.zip | |
- no need to export the TERM variable twice
- re-format case-block
- unquote single word default answer
- use 'break' instead of return to leave (same effect here, but
needed later when the function is no function anymore)
- use -q option with kbd to limit output to warnings/errors only
discussed with and OK krw@ tb@
| -rw-r--r-- | distrib/miniroot/install.sub | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 5ef803bc74e..053331fa68f 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.934 2016/12/18 18:15:14 rpe Exp $ +# $OpenBSD: install.sub,v 1.935 2016/12/19 18:52:54 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -1686,16 +1686,22 @@ set_term() { if [[ -n $CONSOLE ]]; then ask "Terminal type?" $TERM - export TERM=$resp + TERM=$resp else [[ -x /sbin/kbd ]] || return _layouts=$(bsort $(kbd -l | egrep -v "^(user|tables|encoding)")) while :; do - ask "Choose your keyboard layout ('?' or 'L' for list)" "default" + ask "Choose your keyboard layout ('?' or 'L' for list)" default case $resp in - [lL\?]) echo "Available layouts: $_layouts";; - default) return;; - *) kbd $resp && { echo $resp >/tmp/i/kbdtype; return; };; + [lL\?]) echo "Available layouts: $_layouts" + ;; + default) break + ;; + *) if kbd -q "$resp"; then + echo $resp >/tmp/i/kbdtype + break + fi + ;; esac done fi |