Make modifications of "/etc/shells" robust so that they don't fail if the

last entry is removed.

5 files changed, 10 insertions, 10 deletions

diff --git a/shells/bash2/pkg/PLIST b/shells/bash2/pkg/PLIST
index ab8980a5400..ea3188e7b0b 100644
--- a/shells/bash2/pkg/PLIST
+++ b/shells/bash2/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2000/12/11 22:55:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/09/23 21:06:07 tron Exp $
 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
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; 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.gz
diff --git a/shells/standalone-tcsh/pkg/PLIST b/shells/standalone-tcsh/pkg/PLIST
index 476b98fb69a..4b5d0cd4a18 100644
--- a/shells/standalone-tcsh/pkg/PLIST
+++ b/shells/standalone-tcsh/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2001/08/06 20:46:58 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/09/23 21:06:08 tron Exp $
 bin/tcsh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v '^%D%F$' /etc/shells.bak; echo %D%F) >/etc/shells
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v '^%D%F$' /etc/shells.bak || true; 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
 usr/share/man/man1/tcsh.1
diff --git a/shells/tcsh/pkg/PLIST b/shells/tcsh/pkg/PLIST
index fd7af53983a..afa8fc1e9dd 100644
--- a/shells/tcsh/pkg/PLIST
+++ b/shells/tcsh/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 1998/10/03 07:06:25 kim Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/09/23 21:06:08 tron Exp $
 bin/tcsh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; 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
 man/man1/tcsh.1
diff --git a/shells/zsh/pkg/PLIST b/shells/zsh/pkg/PLIST
index e9c48c8a0e4..530f8a03d06 100644
--- a/shells/zsh/pkg/PLIST
+++ b/shells/zsh/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.9 2001/07/23 18:23:45 nra Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/09/23 21:06:08 tron Exp $
 bin/zsh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; 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/${PKGNAME}
 @unexec install-info --delete %D/info/zsh.info %D/info/dir
diff --git a/shells/zsh3/pkg/PLIST b/shells/zsh3/pkg/PLIST
index feb70c493ca..e4bd68c6762 100644
--- a/shells/zsh3/pkg/PLIST
+++ b/shells/zsh3/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/06/05 16:30:15 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/09/23 21:06:08 tron Exp $
 bin/zsh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; 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/${PKGNAME}
 @unexec install-info --delete %D/info/zsh.info %D/info/dir