From 0d5fba6caa8f2e7cf61221467ccf8cd5d106472c Mon Sep 17 00:00:00 2001
From: gene <gene@openbsd.org>
Date: Sat, 13 Dec 1997 00:20:42 +0000
Subject: [PATCH] Explicitly warn about /etc/shells empowering the system
 administrator rather then editing /etc/shells for them.

---
 shells/bash/Makefile  | 8 +++++++-
 shells/bash/pkg/PLIST | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index ff6371cac78..20ea4095c96 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 November 1997
 # Whom:			gene
 #
-# $OpenBSD: Makefile,v 1.3 1997/11/19 01:07:52 joey Exp $
+# $OpenBSD: Makefile,v 1.4 1997/12/13 00:20:42 gene Exp $
 #
 
 DISTNAME=       bash-1.14.7
@@ -21,5 +21,11 @@ post-install:
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	 fi
 	@install-info ${PREFIX}/info/bash.info ${PREFIX}/info/dir
+	@$(ECHO) "Finished installing $(DISTNAME)"
+	@$(ECHO) "To complete the install, you should notify the system"
+	@$(ECHO) "that $(PREFIX)/bin/bash is a valid shell by adding it to"
+	@$(ECHO) "/etc/shells."
+	@$(ECHO) "If you are unfamiliar with this file, consult the shells(5)"
+	@$(ECHO) "manual page."
 
 .include <bsd.port.mk>
diff --git a/shells/bash/pkg/PLIST b/shells/bash/pkg/PLIST
index cf0d01fa463..84bd1c539a5 100644
--- a/shells/bash/pkg/PLIST
+++ b/shells/bash/pkg/PLIST
@@ -1,6 +1,4 @@
 bin/bash
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
 bin/bashbug
 man/man1/bash.1
 man/man1/bash_builtins.1
@@ -8,3 +6,4 @@ man/man1/bash_builtins.1
 info/bash.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/bash.info %D/info/dir
+@unexec echo "Don't forget to remove %D/bin/bash from /etc/shells"