Ticket #12719: trac_12719-ipythondir013.patch

File trac_12719-ipythondir013.patch, 1000 bytes (added by jason, 8 years ago)

rebased to 5.4rc1

  • spkg/bin/sage

    # HG changeset patch
    # User Jason Grout <jason.grout@drake.edu>
    # Date 1340208000 18000
    # Node ID fe8d061202b1d98bf3afa1547d8bd9c5d7afa7d3
    # Parent  3df091cad45f47ae58fea0179f2d92146938fb6f
    change IPYTHON_DIR to IPYTHONDIR to avoid ipython deprecation warning
    
    diff --git a/spkg/bin/sage b/spkg/bin/sage
    a b  
    279279LOGFILE="$SAGE_ROOT/sage.log"
    280280LOGOPT=""
    281281
    282 IPYTHON_DIR="$DOT_SAGE/ipython-0.12" && export IPYTHON_DIR
     282IPYTHONDIR="$DOT_SAGE/ipython-0.12" && export IPYTHONDIR
    283283
    284284sage_setup() {
    285285    # Display the startup banner
     
    291291    # If so, change various hardcoded paths.
    292292    sage-location || exit $?
    293293
    294     if [ ! -d "$IPYTHON_DIR" ]; then
     294    if [ ! -d "$IPYTHONDIR" ]; then
     295        # make sure that $DOT_SAGE exists so that ipython will happily
     296        # create its config directories there.  If DOT_SAGE doesn't
     297        # exist, ipython complains.
    295298        mkdir -p "$DOT_SAGE"
    296299    fi
    297300    sage-cleaner &>/dev/null &