Don't unintentionally overwrite an existing tclsh/wish.

Reported-By:	Mikhail Teterin <mi@kot.ne.mediaone.net>

8 files changed, 28 insertions, 28 deletions

diff --git a/lang/tcl80/pkg-install.tclsh b/lang/tcl80/pkg-install.tclsh
index 7133e84d294f..055957a6c36f 100644
--- a/lang/tcl80/pkg-install.tclsh
+++ b/lang/tcl80/pkg-install.tclsh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # The user may have a tclsh they want to preserve
-if [ ! -f ${PKG_PREFIX}/bin/tclsh ] || [ \
-   `grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh | sed -e 's/.*\*\*//'` \
-   -lt 001 ]
+ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh 2> /dev/null \
+    | sed -e 's/.*\*\*//'`
+if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 001 ]
 then
 	[ -f ${PKG_PREFIX}/bin/tclsh ] && chmod u+w ${PKG_PREFIX}/bin/tclsh
 
@@ -28,5 +28,5 @@ done
 ) 1>&2
 exit 1
 EOF
-	chmod a+rx ${PKG_PREFIX}/bin/tclsh
+	chmod 555 ${PKG_PREFIX}/bin/tclsh
 fi
diff --git a/lang/tcl82/pkg-install.tclsh b/lang/tcl82/pkg-install.tclsh
index 7133e84d294f..055957a6c36f 100644
--- a/lang/tcl82/pkg-install.tclsh
+++ b/lang/tcl82/pkg-install.tclsh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # The user may have a tclsh they want to preserve
-if [ ! -f ${PKG_PREFIX}/bin/tclsh ] || [ \
-   `grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh | sed -e 's/.*\*\*//'` \
-   -lt 001 ]
+ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh 2> /dev/null \
+    | sed -e 's/.*\*\*//'`
+if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 001 ]
 then
 	[ -f ${PKG_PREFIX}/bin/tclsh ] && chmod u+w ${PKG_PREFIX}/bin/tclsh
 
@@ -28,5 +28,5 @@ done
 ) 1>&2
 exit 1
 EOF
-	chmod a+rx ${PKG_PREFIX}/bin/tclsh
+	chmod 555 ${PKG_PREFIX}/bin/tclsh
 fi
diff --git a/lang/tcl83/pkg-install.tclsh b/lang/tcl83/pkg-install.tclsh
index 7133e84d294f..055957a6c36f 100644
--- a/lang/tcl83/pkg-install.tclsh
+++ b/lang/tcl83/pkg-install.tclsh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # The user may have a tclsh they want to preserve
-if [ ! -f ${PKG_PREFIX}/bin/tclsh ] || [ \
-   `grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh | sed -e 's/.*\*\*//'` \
-   -lt 001 ]
+ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh 2> /dev/null \
+    | sed -e 's/.*\*\*//'`
+if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 001 ]
 then
 	[ -f ${PKG_PREFIX}/bin/tclsh ] && chmod u+w ${PKG_PREFIX}/bin/tclsh
 
@@ -28,5 +28,5 @@ done
 ) 1>&2
 exit 1
 EOF
-	chmod a+rx ${PKG_PREFIX}/bin/tclsh
+	chmod 555 ${PKG_PREFIX}/bin/tclsh
 fi
diff --git a/lang/tcl84/pkg-install.tclsh b/lang/tcl84/pkg-install.tclsh
index 7133e84d294f..055957a6c36f 100644
--- a/lang/tcl84/pkg-install.tclsh
+++ b/lang/tcl84/pkg-install.tclsh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # The user may have a tclsh they want to preserve
-if [ ! -f ${PKG_PREFIX}/bin/tclsh ] || [ \
-   `grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh | sed -e 's/.*\*\*//'` \
-   -lt 001 ]
+ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/tclsh 2> /dev/null \
+    | sed -e 's/.*\*\*//'`
+if [ ! -e ${PKG_PREFIX}/bin/tclsh ] || [ "$ver" != "" -a "$ver" -lt 001 ]
 then
 	[ -f ${PKG_PREFIX}/bin/tclsh ] && chmod u+w ${PKG_PREFIX}/bin/tclsh
 
@@ -28,5 +28,5 @@ done
 ) 1>&2
 exit 1
 EOF
-	chmod a+rx ${PKG_PREFIX}/bin/tclsh
+	chmod 555 ${PKG_PREFIX}/bin/tclsh
 fi
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