Ticket #12613: 12613_review.patch

File 12613_review.patch, 2.9 KB (added by jdemeyer, 9 years ago)
  • spkg/bin/sage

    # HG changeset patch
    # User Jeroen Demeyer <jdemeyer@cage.ugent.be>
    # Date 1333789624 -7200
    # Node ID 55fec95c26a1f5b2d0bc18c297b30fa263b80d7d
    # Parent  0ad46dee058139041eb8ec368db2e4e8c0243f65
    Don't duplicate documentation for -i and -f options
    
    diff --git a/spkg/bin/sage b/spkg/bin/sage
    a b  
    113113    ####  |.....................--.|...................................................|
    114114    echo "Installing packages and upgrading:"
    115115    echo "  -experimental       -- list all experimental packages that can be installed"
    116     echo "  -f [packages]       -- force build of the given Sage package (even if it is"
    117     echo "                         already installed)"
    118     echo "  -f -s [packages]    -- like -f but do not delete the spkg/build directories"
    119     echo "  -f -c [packages]    -- like -f but also run the packages' test suites"
    120     echo "  -i [packages]       -- install the given Sage packages"
    121     echo "                         if no packages given, print a list of all installed"
    122     echo "  -i -s [packages]    -- like -i but do not delete the spkg/build directories"
    123     echo "  -i -c [packages]    -- like -i but also run the packages' test suites"
     116    echo "  -f [opts] [packages]-- shortcut for -i -f: force build of the given Sage"
     117    echo "                         packages"
     118    echo "  -i [opts] [packages]-- install the given Sage packages (unless they are"
     119    echo "                         already installed); if no packages are given, print"
     120    echo "                         a list of all installed packages.  Options:"
     121    echo "                           -c -- run the packages' test suites"
     122    echo "                           -f -- force build: install the packages even"
     123    echo "                                 if they are already installed"
     124    echo "                           -s -- do not delete the spkg/build directories"
     125    echo "                                 after a successful build"
    124126    echo "  -optional           -- list all optional packages that can be installed"
    125127    echo "  -standard           -- list all standard packages that can be installed"
    126128   #echo "  -update             -- download latest non-optional Sage packages (do not build them)"
  • spkg/bin/sage-spkg

    diff --git a/spkg/bin/sage-spkg b/spkg/bin/sage-spkg
    a b  
    166166    shift
    167167fi
    168168
     169if [ $1 = '-c' ]; then
     170    export SAGE_CHECK=yes
     171    SAGE_CHECK_PACKAGES=x  # nonempty, so not set to '!python' later
     172    shift
     173fi
     174
    169175if [ "x$SAGE_KEEP_BUILT_SPKGS" = "xyes" ]; then
    170176    DELETE_TMP=0
    171177fi
     
    177183    unset UNTAR_VERBOSE
    178184fi
    179185
    180 if [ $1 = '-c' ]; then
    181     export SAGE_CHECK=yes
    182     SAGE_CHECK_PACKAGES='x' # nonempty, so not set to '!python' later
    183     shift
    184 fi
    185 
    186186##################################################################
    187187# Figure out the package filename, download it if needed.
    188188##################################################################