don't mess with cdpath
This commit is contained in:
parent
61fb002677
commit
09697fefb6
|
|
@ -378,9 +378,9 @@ sub CTAttachCompute {
|
|||
&CTAttachMod( "LD_LIBRARY_PATH", $item, $root, $proj ) ;
|
||||
#}
|
||||
|
||||
$item = $root . "/src" ;
|
||||
#$item = $root . "/src" ;
|
||||
#if ( -e $item ) {
|
||||
&CTAttachMod( "CDPATH", $item, $root, $proj ) ;
|
||||
#&CTAttachMod( "CDPATH", $item, $root, $proj ) ;
|
||||
#}
|
||||
|
||||
$item = $root . "/include" ;
|
||||
|
|
@ -484,14 +484,14 @@ sub CTAttachWriteScript {
|
|||
}
|
||||
}
|
||||
|
||||
if ( $newenv{"CDPATH"} ne "" ) {
|
||||
if ( $shell_type ne "sh" ) {
|
||||
print OUTFILE "set cdpath = ( \$" . "CDPATH )\n" ;
|
||||
if ( $ctdebug ) {
|
||||
print OUTFILE "echo assigning cdpath\n" ;
|
||||
}
|
||||
}
|
||||
}
|
||||
#if ( $newenv{"CDPATH"} ne "" ) {
|
||||
# if ( $shell_type ne "sh" ) {
|
||||
# print OUTFILE "set cdpath = ( \$" . "CDPATH )\n" ;
|
||||
# if ( $ctdebug ) {
|
||||
# print OUTFILE "echo assigning cdpath\n" ;
|
||||
# }
|
||||
# }
|
||||
#}
|
||||
for ($item = 0; $item < $docnt; $item++) {
|
||||
print OUTFILE $envdo{$item} . "\n" ;
|
||||
if ( $ctdebug ) {
|
||||
|
|
|
|||
|
|
@ -565,7 +565,7 @@ sub CTAttachCompute {
|
|||
|
||||
&CTAttachAddToMod( "PATH", $root . "/bin" ) ;
|
||||
&CTAttachAddToMod( "LD_LIBRARY_PATH", $root . "/lib" ) ;
|
||||
&CTAttachAddToMod( "CDPATH", $root . "/src/all" ) ;
|
||||
#&CTAttachAddToMod( "CDPATH", $root . "/src/all" ) ;
|
||||
&CTAttachAddToMod( "CT_INCLUDE_PATH", $root . "/include" ) ;
|
||||
&CTAttachAddToMod( "DC_PATH", $root . "/etc" ) ;
|
||||
&CTAttachAddToMod( "PFPATH", $root . "/etc/models" ) ;
|
||||
|
|
@ -933,9 +933,9 @@ sub CTAttachWriteScript {
|
|||
print OUTFILE $ENV{$item} . "\"\n" ;
|
||||
}
|
||||
}
|
||||
if (( $envset{"CDPATH"} ne "" ) || ( $envmod{"CDPATH"} ne "" )) {
|
||||
print OUTFILE "set cdpath = ( \$" . "CDPATH )\n" ;
|
||||
}
|
||||
#if (( $envset{"CDPATH"} ne "" ) || ( $envmod{"CDPATH"} ne "" )) {
|
||||
# print OUTFILE "set cdpath = ( \$" . "CDPATH )\n" ;
|
||||
#}
|
||||
foreach $item ( keys %envdo ) {
|
||||
print OUTFILE $envdo{$item} . "\n" ;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,8 +92,8 @@ sub CTUnattachCompute {
|
|||
&CTUnattachMod( "PATH", $item ) ;
|
||||
}
|
||||
&CTUnattachMod( "LD_LIBRARY_PATH", $item ) ;
|
||||
$item = $root . "/src/all" ;
|
||||
&CTUnattachMod( "CDPATH", $item ) ;
|
||||
#$item = $root . "/src/all" ;
|
||||
#&CTUnattachMod( "CDPATH", $item ) ;
|
||||
$item = $root . "/include" ;
|
||||
&CTUnattachMod( "CT_INCLUDE_PATH", $item ) ;
|
||||
$item = $root . "/etc" ;
|
||||
|
|
@ -178,11 +178,11 @@ sub CTUnattachWriteScript {
|
|||
open( OUTFILE, ">$_[0]" ) ;
|
||||
print OUTFILE "#!/bin/" . $shell_type . " -f\n" ;
|
||||
local( $item ) ;
|
||||
local( $unsetcdpath ) = 0 ;
|
||||
local( $modcdpath ) = 0 ;
|
||||
#local( $unsetcdpath ) = 0 ;
|
||||
#local( $modcdpath ) = 0 ;
|
||||
|
||||
foreach $item ( @unset ) {
|
||||
if ( $item eq "CDPATH" ) { $unsetcdpath = 1 ; }
|
||||
#if ( $item eq "CDPATH" ) { $unsetcdpath = 1 ; }
|
||||
|
||||
if ( $shell_type eq "sh" ) {
|
||||
print OUTFILE "$item=\n" ;
|
||||
|
|
@ -198,7 +198,7 @@ sub CTUnattachWriteScript {
|
|||
}
|
||||
}
|
||||
foreach $item ( keys %newenv ) {
|
||||
if ( $item eq "CDPATH" ) { $modcdpath = 1 ; }
|
||||
#if ( $item eq "CDPATH" ) { $modcdpath = 1 ; }
|
||||
|
||||
local( $sep ) = " " ;
|
||||
if ( $envsep{$item} ne "" ) {
|
||||
|
|
@ -228,15 +228,15 @@ sub CTUnattachWriteScript {
|
|||
}
|
||||
}
|
||||
}
|
||||
if ( $unsetcdpath ) {
|
||||
if ( $shell_type ne "sh" ) {
|
||||
print OUTFILE "unset cdpath\n" ;
|
||||
}
|
||||
} elsif ( $modcdpath ) {
|
||||
if ( $shell_type ne "sh" ) {
|
||||
print OUTFILE "set cdpath = ( \$" . "CDPATH )\n" ;
|
||||
}
|
||||
}
|
||||
#if ( $unsetcdpath ) {
|
||||
# if ( $shell_type ne "sh" ) {
|
||||
# print OUTFILE "unset cdpath\n" ;
|
||||
# }
|
||||
#} elsif ( $modcdpath ) {
|
||||
# if ( $shell_type ne "sh" ) {
|
||||
# print OUTFILE "set cdpath = ( \$" . "CDPATH )\n" ;
|
||||
# }
|
||||
#}
|
||||
|
||||
if (! $ctdebug) {
|
||||
print OUTFILE "rm -f $_[0]\n" ;
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ endif
|
|||
#endif
|
||||
|
||||
setenv CT_INCLUDE_PATH "."
|
||||
set cdpath = ( . )
|
||||
setenv CDPATH "."
|
||||
#set cdpath = ( . )
|
||||
#setenv CDPATH "."
|
||||
setenv DC_PATH "."
|
||||
setenv SSPATH "."
|
||||
setenv STKPATH "."
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ LD_LIBRARY_PATH="."
|
|||
export LD_LIBRARY_PATH
|
||||
CT_INCLUDE_PATH="."
|
||||
export CT_INCLUDE_PATH
|
||||
cdpath=.
|
||||
CDPATH="."
|
||||
export CDPATH
|
||||
#cdpath=.
|
||||
#CDPATH="."
|
||||
#export CDPATH
|
||||
DC_PATH="."
|
||||
export DC_PATH
|
||||
SSPATH="."
|
||||
|
|
|
|||
Loading…
Reference in New Issue