summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorTim Vanderhoek <hoek@FreeBSD.org>1999-05-26 00:34:26 +0000
committerTim Vanderhoek <hoek@FreeBSD.org>1999-05-26 00:34:26 +0000
commitb9d6168895181749a99d4cc17c4a595f2df6d6da (patch)
tree2746c47ed22952406ed30b52e88d4443172a7706 /x11-toolkits
parentUpgrade to 3.1.5. (diff)
Don't unintentionally overwrite an existing tclsh/wish.
Reported-By: Mikhail Teterin <mi@kot.ne.mediaone.net>
Notes
Notes: svn path=/head/; revision=19000
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/tk80/pkg-install.wish6
-rw-r--r--x11-toolkits/tk82/pkg-install.wish6
-rw-r--r--x11-toolkits/tk83/pkg-install.wish6
-rw-r--r--x11-toolkits/tk84/pkg-install.wish6
4 files changed, 12 insertions, 12 deletions
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