diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-13 02:04:12 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-13 02:04:12 +0000 |
| commit | 6322921784ceca296a614dc1a3698e43fe8e0027 (patch) | |
| tree | 41a0fcef63e80339b0a88bbea2049710dcc16af2 /distrib/miniroot/install.sub | |
| parent | 32019ae92c1a2dc7fd47715eb293859dddbc3c14 (diff) | |
krw says comments only stripped when alone on a line
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index d678e9d0e89..2eab1472406 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.452 2009/04/13 01:59:19 deraadt Exp $ +# $OpenBSD: install.sub,v 1.453 2009/04/13 02:04:11 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2007 Todd Miller, Theo de Raadt, Ken Westerback @@ -481,7 +481,7 @@ addhostent() { # Set $resp to list of selected sets. select_sets() { local _avail=$1 _selected=$2 _next _f _action _col _p - typeset -L16 _l # 16 characters per column + typeset -L16 _l cat <<__EOT @@ -504,20 +504,24 @@ __EOT echo -n ' ' fi if (( ${#_p} > 16 )); then - print -n "$_p" # XXX site* is last entry - _col=2 # trigger a new line + # probably site##-hostname.tgz, so print the + # long version and force a newline + print -n "$_p" + _col=2 else _l="$_p" print -n "$_l" fi let _col=_col+1 if (( _col == 3 )); then - echo # end of a column + # end of a column + echo _col=0 fi done if (( _col % 3 )); then - echo # complete a partial column + # complete a partial column + echo fi : ${_next:=done} |