Ticket #11073: 11073_extcode.patch

File 11073_extcode.patch, 1.4 KB (added by jdemeyer, 16 months ago)

  • sage/ext/mac-app/start-sage.sh 

    # HG changeset patch
# User Jeroen Demeyer <jdemeyer@cage.ugent.be>
# Date 1326786844 -3600
# Node ID c329288db10836f910e1602805a6a2d1d06b7a72
# Parent  28f88f873bc08b97b579f32aece735170577b3eb
Change path to sage-env

diff --git a/sage/ext/mac-app/start-sage.sh b/sage/ext/mac-app/start-sage.sh
    a b  
    3636# Move to a fake SAGE_ROOT -- without spaces 
    3737cd /tmp/sage-mac-app || exit 1 
    3838 
    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# sage-env.  In order to support older versions 4.x of Sage, we try both 
     41# spkg/bin/sage-env and local/bin/sage-env. 
    4042echo Setting environment variables >> "$SAGE_LOG" 
    41 . ./local/bin/sage-env >> "$SAGE_LOG" 2>> "$SAGE_LOG" 
     43{ . spkg/bin/sage-env || . local/bin/sage-env; } >> "$SAGE_LOG" 2>> "$SAGE_LOG" 
    4244export SAGE_ROOT 
    4345 
    4446# Mac OS X app bundles are *intended* to be moved around, and/or given away 
    … …  
    4749echo Checking install location >> "$SAGE_LOG" 
    4850./local/bin/sage-location >> "$SAGE_LOG" 2>> "$SAGE_LOG" 
    4951 
    50 echo Checking existance of notebook directory >> "$SAGE_LOG" 
     52echo Checking existence of notebook directory >> "$SAGE_LOG" 
    5153if [ -d $DOT_SAGE/sage_notebook.sagenb ]; then 
    5254    echo Starting Notebook >> "$SAGE_LOG" 
    5355    ./sage --notebook >> "$SAGE_LOG" 2>> "$SAGE_LOG"