diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2002-11-01 01:08:16 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2002-11-01 01:08:16 +0000 |
| commit | 9861259adec083228b86f22a654df5ac44bb12ad (patch) | |
| tree | a1b2859afd5d49556352ce30fd149963e4d10bea /distrib/miniroot | |
| parent | b2625c878846fe41fcea49fa9b2468e9467aeee9 (diff) | |
Cleanup. Don't bother complaining when the user selects some non-existant
set. Just re-display the selection list unchanged. Smaller, cleaner.
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index de2887781b7..50af3d0ad90 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.268 2002/10/31 00:30:31 krw Exp $ +# $OpenBSD: install.sub,v 1.269 2002/11/01 01:08:15 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback @@ -816,11 +816,10 @@ enable_network() { return 0 } -# Do globbing on the selection and parse +/-, sets the global +# Do globbing on the selection and parse +/-. Update the global # GET_FILES appropriately. glob_selection() { - local _selection=$1 _src=$2 - local _action _nomatch _f + local _selection=$1 _action _f # Change +/- into add/remove, but ignore bare '+' or '-' _action=addel @@ -841,21 +840,10 @@ glob_selection() { eval "case $_f in $_selection) GET_FILES=\`$_action $_f \$GET_FILES\` - _nomatch=false ;; esac" done set +o noglob - - if $_nomatch; then - cat << __EOT -The file - - '${_src}/${_selection}' - -does not exist. Check to make sure you entered the name properly. -__EOT - fi } # Set global SETS to either @@ -944,7 +932,7 @@ __EOT [ "$resp" = "done" ] && break - glob_selection "$resp" "$_src" + glob_selection "$resp" done } |