From c860c631c8e77b56dd478816cc3b729d50ecd9c1 Mon Sep 17 00:00:00 2001 From: cas Date: Wed, 27 Jun 2001 17:56:35 +0000 Subject: [PATCH] No comments --- src/WOKsite/tclshrc_Wok | 29 +++++++++++------------------ src/WOKsite/wokcfg | 2 -- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/WOKsite/tclshrc_Wok b/src/WOKsite/tclshrc_Wok index 1178ce2..877a031 100755 --- a/src/WOKsite/tclshrc_Wok +++ b/src/WOKsite/tclshrc_Wok @@ -5,25 +5,18 @@ if { ! [info exists env(WOK_SESSIONID)] } { set env(WOK_SESSIONID) "$env(HOME)/.wok" } -global tcl_platform - -if { "$tcl_platform(platform)" == "WindowsNT" } { - wm withdraw . +if { [info exists env(WOK_LIBRARY)] } { + lappend auto_path $env(WOK_LIBRARY) + package require Wok + package require Ms + set tcl_prompt1 {if {[info commands wokcd] != ""} then \ + {puts -nonewline stdout "[wokcd]> "} else \ + {puts -nonewline stdout "tclsh> "}} +} else { + puts stderr "Warning: The environment variable WOK_LIBRARY is mandatory to" + puts stderr " load the package Wok." + puts stderr " " } -package require Wok -package require Ms - -if [catch { package require Tclx } TclXHere] { - puts stderr "Warning : You'll need package TclX to correctly use WOK." - puts stderr " Check for variable TCLLIBPATH" -} -if [catch { package require Expect } ExpectHere] { - puts stderr "Warning : You'll need package Expect to use WOK integration package.." - puts stderr " Check for variable TCLLIBPATH" -} -set tcl_prompt1 {if {[info commands wokcd] != ""} then \ - {puts -nonewline stdout "[wokcd]> "} else \ - {puts -nonewline stdout "tclsh> "}} diff --git a/src/WOKsite/wokcfg b/src/WOKsite/wokcfg index f6bb99a..7b1bd36 100755 --- a/src/WOKsite/wokcfg +++ b/src/WOKsite/wokcfg @@ -123,7 +123,6 @@ switch ( `uname` ) endsw setenv PATH "${TCLHOME}/bin:${PATH}" -setenv TCLLIBPATH "${TCLHOME}/lib/itcl ${TCLHOME}/lib $WOK_LIBRARY/${WOKSTATION} $WOK_LIBRARY " setenv WOK_LIBPATH ${WOK_LIBRARY}:${WOK_LIBRARY}/${WOKSTATION} setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${WOK_LIBRARY}/${WOKSTATION} if ( "`uname`" == "HP-UX" ) setenv SHLIB_PATH "${LD_LIBRARY_PATH}:${TCLHOME}/lib/" @@ -132,7 +131,6 @@ if ( "`uname`" == "AIX" ) setenv LIBPATH "${LD_LIBRARY_PATH}:${TCLHOME}/lib/" if ( $justrun ) then echo "Now running tclsh using :" echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH" - echo "TCLLIBPATH = $TCLLIBPATH" echo "WOKHOME = $WOKHOME" echo "PATH = $PATH" if ( $script ) then -- 2.39.5