# HG changeset patch
# User Jeroen Demeyer <jdemeyer@cage.ugent.be>
# Date 1326786844 3600
# Node ID c329288db10836f910e1602805a6a2d1d06b7a72
# Parent 28f88f873bc08b97b579f32aece735170577b3eb
Change path to sageenv
diff git a/sage/ext/macapp/startsage.sh b/sage/ext/macapp/startsage.sh
a

b


36  36  # Move to a fake SAGE_ROOT  without spaces 
37  37  cd /tmp/sagemacapp  exit 1 
38  38  
39   # Set (i.e. "source") SAGE_ROOT and all the other environment settings 
 39  # Set SAGE_ROOT and all the other environment variables by sourcing 
 40  # sageenv. In order to support older versions 4.x of Sage, we try both 
 41  # spkg/bin/sageenv and local/bin/sageenv. 
40  42  echo Setting environment variables >> "$SAGE_LOG" 
41   . ./local/bin/sageenv >> "$SAGE_LOG" 2>> "$SAGE_LOG" 
 43  { . spkg/bin/sageenv  . local/bin/sageenv; } >> "$SAGE_LOG" 2>> "$SAGE_LOG" 
42  44  export SAGE_ROOT 
43  45  
44  46  # Mac OS X app bundles are *intended* to be moved around, and/or given away 
… 
… 

47  49  echo Checking install location >> "$SAGE_LOG" 
48  50  ./local/bin/sagelocation >> "$SAGE_LOG" 2>> "$SAGE_LOG" 
49  51  
50   echo Checking existance of notebook directory >> "$SAGE_LOG" 
 52  echo Checking existence of notebook directory >> "$SAGE_LOG" 
51  53  if [ d $DOT_SAGE/sage_notebook.sagenb ]; then 
52  54  echo Starting Notebook >> "$SAGE_LOG" 
53  55  ./sage notebook >> "$SAGE_LOG" 2>> "$SAGE_LOG" 