diff options
Diffstat (limited to 'distrib/amiga')
| -rw-r--r-- | distrib/amiga/miniroot/dot.profile | 52 | ||||
| -rw-r--r-- | distrib/amiga/ramdisk/dot.profile | 52 |
2 files changed, 4 insertions, 100 deletions
diff --git a/distrib/amiga/miniroot/dot.profile b/distrib/amiga/miniroot/dot.profile index f34af51dc36..4d54ea3c36a 100644 --- a/distrib/amiga/miniroot/dot.profile +++ b/distrib/amiga/miniroot/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.9 2001/09/17 14:52:18 millert Exp $ +# $OpenBSD: dot.profile,v 1.10 2001/12/05 19:50:46 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -32,10 +32,7 @@ # export PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ -export HISTFILE=/.sh_history - umask 022 - set -o emacs # emacs-style command line editing # XXX @@ -44,16 +41,9 @@ set -o emacs # emacs-style command line editing # from the various (semi) MI install and upgrade scripts # terminals believed to be in termcap, default TERM -TERMS="sun vt* pcvt* pc3 dumb" +TERMS="sun vt* pcvt* dumb" TERM=vt220 -# editors believed to be in $EDITBIN, smart and dumb defaults -EDITORS="vi ed" -EDITOR=vi -DUMB=ed -EDITBIN=/bin -EDITUBIN=/usr/bin - if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES @@ -74,44 +64,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then done export TERM - # get the editor preference - if [ "X$TERM" = "Xdumb" -o "X$TERM" = "Xunknown" ]; then - echo -n "$TERM can't handle $EDITOR" - EDITOR="$DUMB" - echo ", using $EDITOR as text editor!" - elif [ "X$EDITOR" = "X$EDITORS" ]; then - echo "Only one editor available, you get to use $EDITOR!" - else - _forceloop="" - while [ "X$_forceloop" = X"" ]; do - echo "Supported editors are: $EDITORS" - echo -n "text editor? [$EDITOR] " - read _choice - if [ "X$_choice" = "X" ]; then - _choice="$EDITOR" - _forceloop="$_choice" - else - for _editor in $EDITORS; do - if [ "X$_choice" = "X$_editor" ]; then - _forceloop="$_choice" - break - fi - done - fi - if [ "X$_forceloop" != "X" -a \ - ! \( -x $EDITBIN/$_choice -o \ - -x $EDITUBIN/$_choice \) ]; then - _forceloop="" - fi - if [ "X$_forceloop" = "X" ]; then - echo "Sorry, $_choice isn't available." - _forceloop="" - fi - done - EDITOR="$_choice" - fi - export EDITOR - # Installing or upgrading? _forceloop="" while [ "X$_forceloop" = X"" ]; do diff --git a/distrib/amiga/ramdisk/dot.profile b/distrib/amiga/ramdisk/dot.profile index e9b0ed90ea6..c1e89f8627c 100644 --- a/distrib/amiga/ramdisk/dot.profile +++ b/distrib/amiga/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.8 2001/09/17 14:52:18 millert Exp $ +# $OpenBSD: dot.profile,v 1.9 2001/12/05 19:50:46 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -38,21 +38,10 @@ umask 022 set -o emacs # emacs-style command line editing -# XXX -# the TERM/EDITOR stuff is really well enough parameterized to be moved -# into install.sub where it could use the routines there and be invoked -# from the various (semi) MI install and upgrade scripts - # terminals believed to be in termcap, default TERM -TERMS="sun vt* pcvt* pc3 dumb" +TERMS="sun vt* pcvt* dumb" TERM=sun -# editors believed to be in $EDITBIN, smart and dumb defaults -EDITORS="vi ed" -EDITOR=vi -DUMB=ed -EDITBIN=/bin - if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES @@ -73,43 +62,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then done export TERM - # get the editor preference - if [ "X$TERM" = "Xdumb" -o "X$TERM" = "Xunknown" ]; then - echo -n "$TERM can't handle $EDITOR" - EDITOR="$DUMB" - echo ", using $EDITOR as text editor!" - elif [ "X$EDITOR" = "X$EDITORS" ]; then - echo "Only one editor available, you get to use $EDITOR!" - else - _forceloop="" - while [ "X$_forceloop" = X"" ]; do - echo "Supported editors are: $EDITORS" - echo -n "text editor? [$EDITOR] " - read _choice - if [ "X$_choice" = "X" ]; then - _choice="$EDITOR" - _forceloop="$_choice" - else - for _editor in $EDITORS; do - if [ "X$_choice" = "X$_editor" ]; then - _forceloop="$_choice" - break - fi - done - fi - if [ "X$_forceloop" != "X" -a ! -x $EDITBIN/$_choice ] - then - _forceloop="" - fi - if [ "X$_forceloop" = "X" ]; then - echo "Sorry, $_choice isn't available." - _forceloop="" - fi - done - EDITOR="$_choice" - fi - export EDITOR - # Installing or upgrading? _forceloop="" while [ "X$_forceloop" = X"" ]; do |