diff options
| author | Alexander Hall <halex@cvs.openbsd.org> | 2009-05-16 08:51:58 +0000 |
|---|---|---|
| committer | Alexander Hall <halex@cvs.openbsd.org> | 2009-05-16 08:51:58 +0000 |
| commit | 62ae37bb2897a86dd21e0f2bf0dca2721417edbc (patch) | |
| tree | a9f35db31e7b30fa73a5bcb01b88126a52be5424 /distrib | |
| parent | 12efbb0e37b7c4425f7bc0333c0378e2e87394fc (diff) | |
cleanup of set_timezone resulting in byte shaving and fixing an issue where
posixright would apprear in the listing of posix/ while it is actually its
sibling
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 53e85e7b70d..af7aa3fd2ca 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.548 2009/05/15 02:00:36 krw Exp $ +# $OpenBSD: install.sub,v 1.549 2009/05/16 08:51:57 halex Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1366,17 +1366,17 @@ set_timezone() { ask "What timezone are you in? ('?' for list)" "$TZ" if [[ $resp = "?" ]]; then - sed -n "/^$_zonepath/{s,^$_zonepath/,,;/\/.*\//d;/\/./d;/./p;}" $_zonefile|showcols + grep -v /. $_zonefile | showcols continue fi _zonepath=$_zonepath$resp while isin $_zonepath/ $(cat $_zonefile); do ask "What sub-timezone of '$_zonepath' are you in? ('?' for list)" - _zsed=$(echo $_zonepath|sed 's/\//\\\//g') + _zsed=$(echo $_zonepath/ | sed 's,/,\\/,g') case $resp in "") ;; - "?") sed -n "/^$_zsed/{s,^$_zsed/,,;/\/.*\//d;/\/./d;/./p;}" $_zonefile|showcols;; + "?") sed -n "/^$_zsed/{s/$_zsed//;/\/./!p;}" $_zonefile | showcols ;; *) _zonepath=$_zonepath/$resp ;; esac done |