aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorhoek <hoek@FreeBSD.org>1999-05-26 08:34:26 +0800
committerhoek <hoek@FreeBSD.org>1999-05-26 08:34:26 +0800
commit9456b0e538bc6fc2f1e8fe8809260e8a5f790096 (patch)
tree1264388f249916c70edc3a897a14808074d463e9 /x11-toolkits
parentf7b619b1a9522a2a05199562433cf3a4e1b87296 (diff)
downloadfreebsd-ports-gnome-9456b0e538bc6fc2f1e8fe8809260e8a5f790096.tar.gz
freebsd-ports-gnome-9456b0e538bc6fc2f1e8fe8809260e8a5f790096.tar.zst
freebsd-ports-gnome-9456b0e538bc6fc2f1e8fe8809260e8a5f790096.zip
Don't unintentionally overwrite an existing tclsh/wish.
Reported-By: Mikhail Teterin <mi@kot.ne.mediaone.net>
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