--- ray/src/util/tradinstall.csh	1995/09/20 12:55:18	2.2
+++ ray/src/util/tradinstall.csh	2011/10/26 20:06:17	2.8
@@ -1,5 +1,5 @@
-#!/bin/csh -f
-# SCCSid "$SunId$ LBL"
+#!/bin/csh -fe
+# RCSid: $Id: tradinstall.csh,v 2.8 2011/10/26 20:06:17 greg Exp $
 # Install correct version of trad for wish or wish4.0
 #
 set instdir = $1
@@ -9,37 +9,32 @@ set TLIBFILES = ( *[a-z].tcl *.hlp trad.icon tclIndex 
 
 set TDIFFS = (`ls | sed -n 's/3\.6\.tcl$//p'`)
 
-foreach d ($path)
-	if (-x $d/wish4.0) then
-		set wishcom = $d/wish4.0
-		break
-	endif
-end
-if (! $?wishcom) then
+set WISHCOMS = ( wish4.{3,2,1,0} wish8.0 wish )
+
+foreach w ( $WISHCOMS )
 	foreach d ($path)
-		if (-x $d/wish) then
-			set wishcom = "$d/wish -f"
+		if (-x $d/$w) then
+			set wishcom = $d/$w
 			break
 		endif
 	end
-	if (! $?wishcom) then
-		echo "Cannot find wish executable in current path -- trad not installed."
-		exit 1
-	endif
-	set oldwish
+	if ( $?wishcom ) break
+end
+if (! $?wishcom) then
+	echo "Cannot find wish executable in current path -- trad not installed."
+	exit 1
 endif
+if ("`file $wishcom`" =~ "*shell script*") then
+	set wishcom="/bin/sh"
+endif
 
 echo "Installing trad using $wishcom"
 
 sed -e "1s|/usr/local/bin/wish4\.0|$wishcom|" \
 	-e "s|^set radlib .*|set radlib $libdir|" trad.wsh > $instdir/trad
-if ($status) exit 1
 chmod 755 $instdir/trad
+if (! -d $libdir) then
+	mkdir $libdir
+endif
 (cd $libdir ; rm -f $TLIBFILES)
 cp $TLIBFILES $libdir
-if ($?oldwish) then
-	foreach i ($TDIFFS)
-		(cd $libdir ; rm -f $i.tcl)
-		cp ${i}3.6.tcl $libdir/$i.tcl
-	end
-endif