ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/cms-env.spec
(Generate patch)

Comparing COMP/CMSDIST/cms-env.spec (file contents):
Revision 1.9 by eulisse, Wed Jul 12 20:32:02 2006 UTC vs.
Revision 1.13 by eulisse, Sun Jul 16 18:46:10 2006 UTC

# Line 30 | Line 30 | esac
30   SCRAM_ARCH=${SCRAM_ARCH}_$compilerv
31   export SCRAM_ARCH
32  
33 < if [ "$VO_CMS_SW_DIR" != ""  ] then
33 > if [ "$VO_CMS_SW_DIR" != ""  ]
34 > then
35      here=$VO_CMS_SW_DIR
36   else
37      here=`dirname $0`
37 endif
38  
39 < [ -d $here/${SCRAM_ARCH}/etc/profile.d ] || echo "Your shell is not able to find where cmsset_default.sh is. Either cd into the directory where it is or move to zsh".
39 >    if [ "$OSG_APP" != "" ]
40 >    then
41 >        here=$OSG_APP/cmssoft/cms
42 >    fi
43 > fi
44 >
45 > if [ -d $here/${SCRAM_ARCH}/etc/profile.d ]
46 > then
47 >    echo "Your shell is not able to find where cmsset_default.sh is. Either cd into the directory where it is or move to zsh"
48 >    exit 1
49 > fi
50  
51   for pkg in `ls $here/${SCRAM_ARCH}/etc/profile.d/ | grep -e'^S.*[.]sh'`
52   do
53          source $here/${SCRAM_ARCH}/etc/profile.d/$pkg
54   done
55 <
55 > export CMS_PATH=$here
56   EOF_CMSSET_DEFAULT_SH
57  
58  
# Line 91 | Line 101 | if ( ${?VO_CMS_SW_DIR} ) then
101      setenv here $VO_CMS_SW_DIR
102   else
103      setenv here .
104 +    # OSG
105 +    if ( ${?OSG_APP} ) then
106 +        setenv here $OSG_APP/cmssoft/cms
107 +    endif
108 +    # OSG                      
109   endif
110  
111   if ( ! -e $here/cmsset_default.csh ) then
# Line 100 | Line 115 | endif
115   foreach pkg ( `ls ${here}/${SCRAM_ARCH}/etc/profile.d/ | grep -e'^S.*[.]csh'` )
116          source ${here}/${SCRAM_ARCH}/etc/profile.d/$pkg
117   end
118 <
118 > setenv CMS_PATH $here
119   EOF_CMSSET_DEFAULT_CSH
120  
121   %pre

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines