--- ray/src/util/tradinstall.csh	2011/10/26 20:06:17	2.8
+++ ray/src/util/tradinstall.csh	2020/08/27 17:46:52	2.11
@@ -1,15 +1,18 @@
 #!/bin/csh -fe
-# RCSid: $Id: tradinstall.csh,v 2.8 2011/10/26 20:06:17 greg Exp $
+# RCSid: $Id: tradinstall.csh,v 2.11 2020/08/27 17:46:52 greg Exp $
 # Install correct version of trad for wish or wish4.0
 #
 set instdir = $1
 set libdir = $2
 
+# Need to execute in containing directory:
+if ($0:h != $0) cd $0:h
+
 set TLIBFILES = ( *[a-z].tcl *.hlp trad.icon tclIndex )
 
 set TDIFFS = (`ls | sed -n 's/3\.6\.tcl$//p'`)
 
-set WISHCOMS = ( wish4.{3,2,1,0} wish8.0 wish )
+set WISHCOMS = ( wish4.{3,2,1,0} wish8.{6,5,4,3,2,1,0} wish )
 
 foreach w ( $WISHCOMS )
 	foreach d ($path)
@@ -30,7 +33,7 @@ endif
 
 echo "Installing trad using $wishcom"
 
-sed -e "1s|/usr/local/bin/wish4\.0|$wishcom|" \
+sed -e "1s|/usr/bin/wish|$wishcom|" \
 	-e "s|^set radlib .*|set radlib $libdir|" trad.wsh > $instdir/trad
 chmod 755 $instdir/trad
 if (! -d $libdir) then