From b9d6168895181749a99d4cc17c4a595f2df6d6da Mon Sep 17 00:00:00 2001
From: Tim Vanderhoek <hoek@FreeBSD.org>
Date: Wed, 26 May 1999 00:34:26 +0000
Subject: Don't unintentionally overwrite an existing tclsh/wish.

Reported-By:	Mikhail Teterin <mi@kot.ne.mediaone.net>
---
 x11-toolkits/tk80/pkg-install.wish | 6 +++---
 x11-toolkits/tk82/pkg-install.wish | 6 +++---
 x11-toolkits/tk83/pkg-install.wish | 6 +++---
 x11-toolkits/tk84/pkg-install.wish | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'x11-toolkits')

diff --git a/x11-toolkits/tk80/pkg-install.wish b/x11-toolkits/tk80/pkg-install.wish
index 645c3a6e1fb2..d526f076a498 100644
--- a/x11-toolkits/tk80/pkg-install.wish
+++ b/x11-toolkits/tk80/pkg-install.wish
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # The user may have a wish they want to preserve
-if [ ! -f ${PKG_PREFIX}/bin/wish ] || [ \
-   `grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish | sed -e 's/.*\*\*//'` \
-   -lt 001 ]
+ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish 2> /dev/null \
+    | sed -e 's/.*\*\*//'`
+if [ ! -e ${PKG_PREFIX}/bin/wish ] || [ "$ver" != "" -a "$ver" -lt 001 ]
 then
 	[ -f ${PKG_PREFIX}/bin/wish ] && chmod u+w ${PKG_PREFIX}/bin/wish
 
diff --git a/x11-toolkits/tk82/pkg-install.wish b/x11-toolkits/tk82/pkg-install.wish
index 645c3a6e1fb2..d526f076a498 100644
--- a/x11-toolkits/tk82/pkg-install.wish
+++ b/x11-toolkits/tk82/pkg-install.wish
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # The user may have a wish they want to preserve
-if [ ! -f ${PKG_PREFIX}/bin/wish ] || [ \
-   `grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish | sed -e 's/.*\*\*//'` \
-   -lt 001 ]
+ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish 2> /dev/null \
+    | sed -e 's/.*\*\*//'`
+if [ ! -e ${PKG_PREFIX}/bin/wish ] || [ "$ver" != "" -a "$ver" -lt 001 ]
 then
 	[ -f ${PKG_PREFIX}/bin/wish ] && chmod u+w ${PKG_PREFIX}/bin/wish
 
diff --git a/x11-toolkits/tk83/pkg-install.wish b/x11-toolkits/tk83/pkg-install.wish
index 645c3a6e1fb2..d526f076a498 100644
--- a/x11-toolkits/tk83/pkg-install.wish
+++ b/x11-toolkits/tk83/pkg-install.wish
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # The user may have a wish they want to preserve
-if [ ! -f ${PKG_PREFIX}/bin/wish ] || [ \
-   `grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish | sed -e 's/.*\*\*//'` \
-   -lt 001 ]
+ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish 2> /dev/null \
+    | sed -e 's/.*\*\*//'`
+if [ ! -e ${PKG_PREFIX}/bin/wish ] || [ "$ver" != "" -a "$ver" -lt 001 ]
 then
 	[ -f ${PKG_PREFIX}/bin/wish ] && chmod u+w ${PKG_PREFIX}/bin/wish
 
diff --git a/x11-toolkits/tk84/pkg-install.wish b/x11-toolkits/tk84/pkg-install.wish
index 645c3a6e1fb2..d526f076a498 100644
--- a/x11-toolkits/tk84/pkg-install.wish
+++ b/x11-toolkits/tk84/pkg-install.wish
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # The user may have a wish they want to preserve
-if [ ! -f ${PKG_PREFIX}/bin/wish ] || [ \
-   `grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish | sed -e 's/.*\*\*//'` \
-   -lt 001 ]
+ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish 2> /dev/null \
+    | sed -e 's/.*\*\*//'`
+if [ ! -e ${PKG_PREFIX}/bin/wish ] || [ "$ver" != "" -a "$ver" -lt 001 ]
 then
 	[ -f ${PKG_PREFIX}/bin/wish ] && chmod u+w ${PKG_PREFIX}/bin/wish
 
-- 
cgit v1.2.3