From 3e9aee326c173afbdf70c3d8fd23883fb428b709 Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer Date: Tue, 1 Nov 2016 09:56:46 +0100 Subject: [PATCH 1/2] Fix indents and trailing spaces in scripts --- build/bin/sage-logger | 10 +- build/bin/sage-spkg | 144 +++++++++--------- build/bin/sage-uncompress-spkg | 4 +- build/pkgs/autotools/Makefile.build | 2 +- build/pkgs/autotools/dependencies | 2 +- build/pkgs/autotools/spkg-write-makefile | 40 ++--- build/pkgs/benzene/SPKG.txt | 2 +- build/pkgs/bliss/spkg-src | 4 +- build/pkgs/boost_cropped/SPKG.txt | 2 +- build/pkgs/buckygen/SPKG.txt | 2 +- build/pkgs/cddlib/spkg-check | 2 +- build/pkgs/cddlib/spkg-install | 10 +- build/pkgs/cliquer/spkg-src | 2 +- build/pkgs/compilerwrapper/spkg-install | 10 +- build/pkgs/csdp/SPKG.txt | 10 +- build/pkgs/csdp/spkg-install | 2 +- build/pkgs/csdp/spkg-src | 2 +- build/pkgs/database_gap/spkg-install | 8 +- build/pkgs/database_symbolic_data/SPKG.txt | 2 +- .../pkgs/database_symbolic_data/spkg-install | 2 +- build/pkgs/ecl/SPKG.txt | 2 +- build/pkgs/ecm/spkg-install | 8 +- build/pkgs/frobby/SPKG.txt | 2 +- build/pkgs/future/SPKG.txt | 2 +- build/pkgs/gap/spkg-install | 2 +- build/pkgs/gap_packages/spkg-install | 16 +- build/pkgs/giac/SPKG.txt | 2 +- build/pkgs/giacpy_sage/SPKG.txt | 6 +- build/pkgs/giacpy_sage/spkg-install | 2 +- build/pkgs/git/spkg-check | 2 +- build/pkgs/glpk/SPKG.txt | 20 +-- build/pkgs/glpk/spkg-check | 12 +- build/pkgs/graphs/SPKG.txt | 2 +- build/pkgs/iml/spkg-install | 2 +- build/pkgs/jinja2/dependencies | 2 +- build/pkgs/jmol/SPKG.txt | 6 +- build/pkgs/libgap/SPKG.txt | 2 +- build/pkgs/lidia/spkg-install | 2 +- build/pkgs/lie/SPKG.txt | 2 +- build/pkgs/lrslib/SPKG.txt | 2 +- build/pkgs/nauty/spkg-install | 2 +- build/pkgs/normaliz/SPKG.txt | 4 +- build/pkgs/notedown/SPKG.txt | 2 +- build/pkgs/ntl/spkg-install | 6 +- build/pkgs/openblas/SPKG.txt | 2 +- build/pkgs/openblas/write_pc_file.py | 4 +- build/pkgs/openssl/spkg-install | 6 +- build/pkgs/ore_algebra/SPKG.txt | 4 +- build/pkgs/palp/spkg-install | 18 +-- build/pkgs/pandoc_attributes/SPKG.txt | 2 +- build/pkgs/pari/spkg-install | 2 +- build/pkgs/pari_galdata/SPKG.txt | 2 +- build/pkgs/pari_seadata_small/SPKG.txt | 2 +- build/pkgs/polymake/spkg-install | 2 +- build/pkgs/ptyprocess/SPKG.txt | 10 +- build/pkgs/qepcad/SPKG.txt | 4 +- build/pkgs/qhull/SPKG.txt | 2 +- build/pkgs/qhull/spkg-install | 12 +- build/pkgs/r/spkg-install | 16 +- build/pkgs/readline/spkg-install | 16 +- build/pkgs/rw/spkg-install | 2 +- build/pkgs/saclib/SPKG.txt | 2 +- build/pkgs/scipoptsuite/spkg-install | 2 +- build/pkgs/singular/spkg-src | 2 +- build/pkgs/topcom/SPKG.txt | 12 +- build/pkgs/topcom/spkg-src | 2 +- src/bin/sage | 12 +- src/bin/sage-env | 36 ++--- src/bin/sage-fix-pkg-checksums | 4 +- 69 files changed, 275 insertions(+), 275 deletions(-) diff --git a/build/bin/sage-logger b/build/bin/sage-logger index 8e3ad0174b2..e7e8428c203 100755 --- a/build/bin/sage-logger +++ b/build/bin/sage-logger @@ -71,9 +71,9 @@ if [[ "$V" = 0 && $use_prefix = true ]]; then ( exec>> $logfile 2>&1 ; eval "$cmd" ) status=$? if [[ $status != 0 ]]; then - echo " [$logname] error installing, exit status $status. Log file: $logfile" + echo " [$logname] error installing, exit status $status. Log file: $logfile" else - echo " [$logname] successfully installed." + echo " [$logname] successfully installed." fi exit $status else @@ -81,13 +81,13 @@ else # We trap SIGINT such that SIGINT interrupts the main process being # run, not the logging. ( exec 2>&1; eval "$cmd" ) | \ - ( trap '' SIGINT; tee -a "$logfile" | $SED ) + ( trap '' SIGINT; tee -a "$logfile" | $SED ) pipestatus=(${PIPESTATUS[*]}) if [ ${pipestatus[1]} -ne 0 ]; then - exit ${pipestatus[1]} + exit ${pipestatus[1]} else - exit ${pipestatus[0]} + exit ${pipestatus[0]} fi fi diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg index 22f7bf67e12..346b2aff10b 100755 --- a/build/bin/sage-spkg +++ b/build/bin/sage-spkg @@ -118,9 +118,9 @@ write_to_tty() { # Try writing to terminal. Suppress the possible error message if ! ( cat > /dev/tty ) 2> /dev/null ; then - # Fall back to writing to stdout - cat - return 1 + # Fall back to writing to stdout + cat + return 1 fi } @@ -201,8 +201,8 @@ while true; do INFO=1;; -y) YES=1;; - -n) - YES=-1;; + -n) + YES=-1;; -d) SAGE_INSTALL_FETCH_ONLY=1;; -s) @@ -290,10 +290,10 @@ elif [ -z "$PKG_HAS_PATH" ]; then # Warning for experimental packages if [ x`cat "$PKG_SCRIPTS/type"` = x"experimental" -a $INFO = 0 ]; then - if [ $YES != 1 ]; then - # We use /dev/tty here because our output may be redirected - # to a logfile, or line-buffered. - write_to_tty < /dev/tty 2>&1 - else - answer=n - fi - case "$answer" in - n*|N*) exit 1;; - esac - # Confirm the user's input. (This gives important - # feedback to the user when output is redirected to a logfile.) - echo > /dev/tty "OK, installing $PKG_NAME now..." - fi + if [ $? -ne 0 ]; then + echo "Terminal not available for prompting. Use 'sage -i -y $PKG_BASE'" + echo "to install experimental packages in non-interactive mode." + YES=-1 + fi + if [ $YES != -1 ]; then + read -p "Are you sure you want to continue [Y/n]? " answer < /dev/tty > /dev/tty 2>&1 + else + answer=n + fi + case "$answer" in + n*|N*) exit 1;; + esac + # Confirm the user's input. (This gives important + # feedback to the user when output is redirected to a logfile.) + echo > /dev/tty "OK, installing $PKG_NAME now..." + fi fi else @@ -337,9 +337,9 @@ fi if [ $INFO -ne 0 -a "$USE_LOCAL_SCRIPTS" = yes ]; then cat "$PKG_SCRIPTS/SPKG.txt" if [ -r "$PKG_SCRIPTS/type" ] ; then - echo "== Type ==" - echo - cat "$PKG_SCRIPTS/type" + echo "== Type ==" + echo + cat "$PKG_SCRIPTS/type" fi exit 0 fi @@ -353,11 +353,11 @@ if [ ! -f "$PKG_SRC" ]; then else # Handle all the legacy cruft. This branch can be deleted once # we get rid of old-style spkgs - if [ $YES = -1 ]; then - # User provided -n option, so don't even try to download the package" - echo "Old-style packages disabled by use of '-n' option" - exit 1 - fi + if [ $YES = -1 ]; then + # User provided -n option, so don't even try to download the package" + echo "Old-style packages disabled by use of '-n' option" + exit 1 + fi if [ $INFO -eq 0 ]; then echo "Attempting to download package $PKG_NAME" else @@ -402,13 +402,13 @@ if [ ! -f "$PKG_SRC" ]; then # If the download failed (for whatever reason), # fall through and use the .spkg file. else - if [ $YES != 1 ]; then - # Warn and ask the user if downloading an - # experimental package. - # Add a deprecation note for other packages, - # since old-style packages are deprecated. - if [ $repo = experimental ]; then - write_to_tty < /dev/tty 2>&1 - else - answer=n - fi - case "$answer" in - n*|N*) exit 1;; - esac - else - # Deprecated since Sage 6.9, Trac #19158 - write_to_tty < /dev/tty 2>&1 + else + answer=n + fi + case "$answer" in + n*|N*) exit 1;; + esac + else + # Deprecated since Sage 6.9, Trac #19158 + write_to_tty < /dev/tty 2>&1 - elif [ $YES = -1 ]; then - answer=n - else - answer=y - fi - case "$answer" in - n*|N*) exit 1;; - esac - fi - # Confirm the user's input. (This gives important - # feedback to the user when output is redirected to a logfile.) - echo > /dev/tty "OK, installing $PKG_NAME now..." - fi + if [ $? = 0 -a $YES != -1 ]; then + read -t 30 -p "Are you sure (automatically continuing in 30 seconds) [Y/n]? " answer < /dev/tty > /dev/tty 2>&1 + elif [ $YES = -1 ]; then + answer=n + else + answer=y + fi + case "$answer" in + n*|N*) exit 1;; + esac + fi + # Confirm the user's input. (This gives important + # feedback to the user when output is redirected to a logfile.) + echo > /dev/tty "OK, installing $PKG_NAME now..." + fi fi PKG_URL="$MIRROR/$repo/$pkg.spkg" break diff --git a/build/bin/sage-uncompress-spkg b/build/bin/sage-uncompress-spkg index 9f64e2e322e..c3cf032b640 100755 --- a/build/bin/sage-uncompress-spkg +++ b/build/bin/sage-uncompress-spkg @@ -1,12 +1,12 @@ #!/usr/bin/env python # usage: sage-uncompress-spkg [-h] [-d DIR] PKG [FILE] -# +# # positional arguments: # PKG the archive to extract # FILE (deprecated) print the contents of the given archive member to # stdout -# +# # optional arguments: # -h, --help show this help message and exit # -d DIR directory to extract archive contents into diff --git a/build/pkgs/autotools/Makefile.build b/build/pkgs/autotools/Makefile.build index 2a7bb153a04..5420dd66890 100644 --- a/build/pkgs/autotools/Makefile.build +++ b/build/pkgs/autotools/Makefile.build @@ -21,7 +21,7 @@ $(SAGE_LOCAL)/bin/help2man: $(SRC)/help2man-1.46.4 $(SAGE_LOCAL)/bin/makeinfo ######################################################################## # Extract sources from git repository serially -autoconf-2.13.rc1/.tarball-version: +autoconf-2.13.rc1/.tarball-version: ( cd $(SRC)/autoconf && git archive --format=tar --prefix=autoconf-2.13.rc1/ autoconf-2-13-rc1 ) | tar xf - echo 2.13.rc1 >autoconf-2.13.rc1/.tarball-version diff --git a/build/pkgs/autotools/dependencies b/build/pkgs/autotools/dependencies index 4976c4749a9..3b812ffa6b6 100644 --- a/build/pkgs/autotools/dependencies +++ b/build/pkgs/autotools/dependencies @@ -1,4 +1,4 @@ -ncurses git xz +ncurses git xz ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/autotools/spkg-write-makefile b/build/pkgs/autotools/spkg-write-makefile index 56e60401076..2e2189a3466 100755 --- a/build/pkgs/autotools/spkg-write-makefile +++ b/build/pkgs/autotools/spkg-write-makefile @@ -141,10 +141,10 @@ write_make_rules() { ac_ver=`( echo 2.59; autoconf --trace='AC_PREREQ:$1' configure.ac ) | latest_version` fi - # Automake 1.10 thinks it only needs autoconf 2.59, when in fact it needs 2.60. Fix it up. - if [ $p = automake ] && [ $v = 1.10 ]; then - ac_ver=2.60 - fi + # Automake 1.10 thinks it only needs autoconf 2.59, when in fact it needs 2.60. Fix it up. + if [ $p = automake ] && [ $v = 1.10 ]; then + ac_ver=2.60 + fi # Minimum required version of libtool. # Empty by default. @@ -183,17 +183,17 @@ write_make_rules() { echo "$p-$v/.tarball-version: $prevextract" echo -e "\t( cd \$(SRC)/$p && git archive --format=tar --prefix=$p-$v/ $tag ) | tar xf -" echo -e "\techo $v >$p-$v/.tarball-version" - if [ $p = libtool -a ! -f .serial ] ; then - # The file .serial would be generated at "make dist" time. It is used in ltversion.m4. - # If .serial is missing, ltmversion.m4 will be malformed, causing the following warning - # when the user uses autoreconf. - # m4/ltversion.m4:12: warning: ill-formed serial number 'ltversion.m4', - # expecting a version string with only digits and dots - # See Trac #21047. - # Since we don't do "make dist" but rather build from a repository check-out, we have to - # supply the .serial file ourselves. The following recipe is from libtool's Makefile.am. - echo -e "\techo $( git log --pretty=oneline | wc -l | sed 's|[\t ]||g ' ) > $p-$v/.serial" - fi + if [ $p = libtool -a ! -f .serial ] ; then + # The file .serial would be generated at "make dist" time. It is used in ltversion.m4. + # If .serial is missing, ltmversion.m4 will be malformed, causing the following warning + # when the user uses autoreconf. + # m4/ltversion.m4:12: warning: ill-formed serial number 'ltversion.m4', + # expecting a version string with only digits and dots + # See Trac #21047. + # Since we don't do "make dist" but rather build from a repository check-out, we have to + # supply the .serial file ourselves. The following recipe is from libtool's Makefile.am. + echo -e "\techo $( git log --pretty=oneline | wc -l | sed 's|[\t ]||g ' ) > $p-$v/.serial" + fi echo echo "\$(SAGE_LOCAL)/$p-$v: $p-$v/.tarball-version $deps" @@ -201,11 +201,11 @@ write_make_rules() { [ -z "$lt_ver" ] || echo -e "\texport LIBTOOL_VERSION=$lt_ver ; \\\\" [ -z "$ac_ver" ] || echo -e "\texport AUTOCONF_VERSION=$ac_ver ; \\\\" [ -z "$am_ver" ] || echo -e "\texport AUTOMAKE_VERSION=$am_ver ; \\\\" - echo -e "\tcd $p-$v && ${bootstrap}\\\\" - echo -e "\t ./configure --prefix=\"\$(SAGE_LOCAL)/$p-$v\" && \\\\" - echo -e "\t \$\$MAKE && \$\$MAKE install" - echo -e "\t# Remove all files except for the .* files" - echo -e "\t[ \"\$\$SAGE_KEEP_BUILT_SPKGS\" = yes ] || rm -rf $p-$v/*" + echo -e "\tcd $p-$v && ${bootstrap}\\\\" + echo -e "\t ./configure --prefix=\"\$(SAGE_LOCAL)/$p-$v\" && \\\\" + echo -e "\t \$\$MAKE && \$\$MAKE install" + echo -e "\t# Remove all files except for the .* files" + echo -e "\t[ \"\$\$SAGE_KEEP_BUILT_SPKGS\" = yes ] || rm -rf $p-$v/*" echo prevextract="$p-$v/.tarball-version" diff --git a/build/pkgs/benzene/SPKG.txt b/build/pkgs/benzene/SPKG.txt index 2ce530cf1d2..9a5f543f797 100644 --- a/build/pkgs/benzene/SPKG.txt +++ b/build/pkgs/benzene/SPKG.txt @@ -17,7 +17,7 @@ http://www.grinvin.org/ === benzene-20130630 Nico Van Cleemput (10th September 2014) === * #16963: Update for the sage-git directory layout. - + === benzene-20130630 Nico Van Cleemput (30th June 2013) === * First release put into Sage. diff --git a/build/pkgs/bliss/spkg-src b/build/pkgs/bliss/spkg-src index 1985ad8d18d..90073233b77 100755 --- a/build/pkgs/bliss/spkg-src +++ b/build/pkgs/bliss/spkg-src @@ -11,7 +11,7 @@ die () { rm -rf bliss/ git clone -b sage_package https://github.com/mkoeppe/bliss.git || die "Failed to git clone" -cd bliss/ +cd bliss/ VERSION=`autoconf --trace='AC_INIT:$2'` libtoolize || die "Failed to autoreconf" @@ -23,6 +23,6 @@ rm -f bliss-$VERSION.tar.gz make dist || die "make dist failed" mv bliss-$VERSION.tar.gz ../ cd .. -rm -rf bliss/ +rm -rf bliss/ diff --git a/build/pkgs/boost_cropped/SPKG.txt b/build/pkgs/boost_cropped/SPKG.txt index 7493e9997d2..0ed6c59696b 100644 --- a/build/pkgs/boost_cropped/SPKG.txt +++ b/build/pkgs/boost_cropped/SPKG.txt @@ -27,7 +27,7 @@ None === boost_cropped-1.58.0 (Emmanuel Charpentier, November 13th, 2015) === * Updated to boost_1_58_0/boost * Created spkg-src - + === boost_cropped-1.52.0 (Timo Kluck, February 26th, 2013) === * Drop sage patches; take all upstream headers diff --git a/build/pkgs/buckygen/SPKG.txt b/build/pkgs/buckygen/SPKG.txt index 08e5f764ed0..b2c90529321 100644 --- a/build/pkgs/buckygen/SPKG.txt +++ b/build/pkgs/buckygen/SPKG.txt @@ -1,7 +1,7 @@ = Buckygen = == Description == -Buckygen is a program for the efficient generation of all nonisomorphic fullerenes. These are triangulations where all vertices have degree 5 or 6. Or if the dual representation is used: cubic plane graphs where all faces are pentagons or hexagons. +Buckygen is a program for the efficient generation of all nonisomorphic fullerenes. These are triangulations where all vertices have degree 5 or 6. Or if the dual representation is used: cubic plane graphs where all faces are pentagons or hexagons. == License == Buckygen is licensed under the GNU General Public License v3 ( June 2007 ) diff --git a/build/pkgs/cddlib/spkg-check b/build/pkgs/cddlib/spkg-check index ec1bd78e377..79955c231a1 100755 --- a/build/pkgs/cddlib/spkg-check +++ b/build/pkgs/cddlib/spkg-check @@ -12,7 +12,7 @@ run_test() { cat input/$1 | $SAGE_LOCAL/bin/cdd_both_reps_gmp --all > $TEST_OUTPUT # Now, compare the two outputs and error out if there is a discrepancy: diff -n output/$1 $TEST_OUTPUT || ( \ - echo "cdd_both_reps not working as expected"; \ + echo "cdd_both_reps not working as expected"; \ exit 1 ) } diff --git a/build/pkgs/cddlib/spkg-install b/build/pkgs/cddlib/spkg-install index d70d31b0c07..486afa92759 100755 --- a/build/pkgs/cddlib/spkg-install +++ b/build/pkgs/cddlib/spkg-install @@ -7,14 +7,14 @@ die () { [ -n "$SAGE_LOCAL" ] || die "SAGE_LOCAL undefined, maybe run \`sage -sh\`?" -# Normaly for a 64-bit build, the -m64 option is added to -# gcc, but other compilers will not accept that, so +# Normally for a 64-bit build, the -m64 option is added to +# gcc, but other compilers will not accept that, so # allow it to be configured as something different if need -# be. +# be. -if [ -z $CFLAG64 ] ; then +if [ -z $CFLAG64 ] ; then CFLAG64=-m64 -fi +fi if [ "x$SAGE64" = xyes ]; then echo "64 bit build of cddlib" diff --git a/build/pkgs/cliquer/spkg-src b/build/pkgs/cliquer/spkg-src index bcbdabecbe1..27a5c2b2dd8 100755 --- a/build/pkgs/cliquer/spkg-src +++ b/build/pkgs/cliquer/spkg-src @@ -18,6 +18,6 @@ rm -f cliquer-$VERSION.tar.gz make dist mv cliquer-$VERSION.tar.gz ../ cd .. -rm -rf autocliquer/ +rm -rf autocliquer/ diff --git a/build/pkgs/compilerwrapper/spkg-install b/build/pkgs/compilerwrapper/spkg-install index 0a4fea0ee01..2d7b6ceab38 100755 --- a/build/pkgs/compilerwrapper/spkg-install +++ b/build/pkgs/compilerwrapper/spkg-install @@ -7,9 +7,9 @@ if [ -z "$SAGE_LOCAL" ]; then fi # remove wrapper if it is already installed -rm -f $SAGE_LOCAL/bin/gcc +rm -f $SAGE_LOCAL/bin/gcc rm -f $SAGE_LOCAL/bin/cc -rm -f $SAGE_LOCAL/bin/c89 +rm -f $SAGE_LOCAL/bin/c89 rm -f $SAGE_LOCAL/bin/c99 rm -f $SAGE_LOCAL/bin/c++ rm -f $SAGE_LOCAL/bin/g++ @@ -22,9 +22,9 @@ LD_FILENAME=`src/scripts/find_executable.sh --LD --exclude="$SAGE_LOCAL/bin"` GFORTRAN_FILENAME=`src/scripts/find_executable.sh --exclude="$SAGE_LOCAL/bin" gfortran` echo "Setting up the compiler/binutils wrapper" -echo "Real location of compiler: $CC_PATH" -echo "Real linker: $LD_FILENAME" -echo "Real fortran: $GFORTRAN_FILENAME" +echo "Real location of compiler: $CC_PATH" +echo "Real linker: $LD_FILENAME" +echo "Real fortran: $GFORTRAN_FILENAME" cd src ./configure --prefix="$SAGE_LOCAL" \ diff --git a/build/pkgs/csdp/SPKG.txt b/build/pkgs/csdp/SPKG.txt index d7ece63b377..993a28bb3c0 100644 --- a/build/pkgs/csdp/SPKG.txt +++ b/build/pkgs/csdp/SPKG.txt @@ -3,7 +3,7 @@ == Description == This is a fast SDP solver written in C, with a callable library -namely, an autotool'ed version of CSDP, by Brian Borchers, +namely, an autotool'ed version of CSDP, by Brian Borchers, see https://projects.coin-or.org/Csdp == License == @@ -27,15 +27,15 @@ configure.ac and rerun autotools (autoreconf -fiv). Any changes should be merged to the upstream repo. The build is done with NOSHORTS variable defined; this makes it compatible -with packages, where NOSHORTS must be defined, e.g. -https://github.com/dimpase/pycsdp; +with packages, where NOSHORTS must be defined, e.g. +https://github.com/dimpase/pycsdp; also the Sage Cython interface needs NOSHORTS defined. -Detailed steps to build the spkg are as follows. You need +Detailed steps to build the spkg are as follows. You need * git * autotools and libtool (the full autohell suite, version at least 2.67) With these ready: * ./spkg-src - * copy the resulting csdp-.tar.gz to SAGE_ROOT/upstream, + * copy the resulting csdp-.tar.gz to SAGE_ROOT/upstream, or somewhere else appropriate diff --git a/build/pkgs/csdp/spkg-install b/build/pkgs/csdp/spkg-install index db06a53f610..89a9d13e50f 100755 --- a/build/pkgs/csdp/spkg-install +++ b/build/pkgs/csdp/spkg-install @@ -6,7 +6,7 @@ if [ -z "$SAGE_LOCAL" ]; then exit 1 fi -cat LICENSE +cat LICENSE echo "**************************************************" echo "NOTE that csdp's License is NOT GPL-compatible" echo "**************************************************" diff --git a/build/pkgs/csdp/spkg-src b/build/pkgs/csdp/spkg-src index 65ddf18c559..f935c7e7c93 100755 --- a/build/pkgs/csdp/spkg-src +++ b/build/pkgs/csdp/spkg-src @@ -10,7 +10,7 @@ git clone https://github.com/dimpase/csdp.git cd csdp VERSION=`autoconf --trace='AC_INIT:$2'` -autoreconf --install +autoreconf --install automake --add-missing --copy ./configure diff --git a/build/pkgs/database_gap/spkg-install b/build/pkgs/database_gap/spkg-install index ac4a8142d63..6df7bc4b3fd 100755 --- a/build/pkgs/database_gap/spkg-install +++ b/build/pkgs/database_gap/spkg-install @@ -28,7 +28,7 @@ cp -rp small "$SAGE_LOCAL/gap/latest/" if [ $? -ne 0 ]; then echo >&2 "Error installing small group database." exit 1 -fi +fi echo "Installed small group database." rm -rf "$SAGE_LOCAL/gap/latest/prim" @@ -36,7 +36,7 @@ cp -rp prim "$SAGE_LOCAL/gap/latest/" if [ $? -ne 0 ]; then echo >&2 "Error installing prim database." exit 1 -fi +fi echo "Installed prim database." rm -rf "$SAGE_LOCAL/gap/latest/trans" @@ -44,7 +44,7 @@ cp -rp trans "$SAGE_LOCAL/gap/latest/" if [ $? -ne 0 ]; then echo >&2 "Error installing trans database." exit 1 -fi +fi echo "Installed trans database." rm -rf "$SAGE_LOCAL/gap/latest/pkg/tomlib" @@ -52,7 +52,7 @@ cp -rp pkg/tomlib "$SAGE_LOCAL/gap/latest/pkg/" if [ $? -ne 0 ]; then echo >&2 "Error installing tomlib database." exit 1 -fi +fi echo "Installed tomlib database." sage -c "gap_reset_workspace()" diff --git a/build/pkgs/database_symbolic_data/SPKG.txt b/build/pkgs/database_symbolic_data/SPKG.txt index e09e6c47d99..cc59f6d5193 100644 --- a/build/pkgs/database_symbolic_data/SPKG.txt +++ b/build/pkgs/database_symbolic_data/SPKG.txt @@ -38,4 +38,4 @@ List patches that need to be applied and what they do * SPKG.txt added * adapted to new git workflow - + diff --git a/build/pkgs/database_symbolic_data/spkg-install b/build/pkgs/database_symbolic_data/spkg-install index fbbfa7f2483..de03ce7c0ee 100755 --- a/build/pkgs/database_symbolic_data/spkg-install +++ b/build/pkgs/database_symbolic_data/spkg-install @@ -3,7 +3,7 @@ TARGET="$SAGE_SHARE/symbolic_data/" if [ -d "$TARGET" ]; then - rm -rf "$TARGET" + rm -rf "$TARGET" fi mkdir "$TARGET" diff --git a/build/pkgs/ecl/SPKG.txt b/build/pkgs/ecl/SPKG.txt index ee1f1253843..be945bb2319 100644 --- a/build/pkgs/ecl/SPKG.txt +++ b/build/pkgs/ecl/SPKG.txt @@ -34,7 +34,7 @@ Website: http://ecls.sourceforge.net/ * boehm_gc == Special Update/Build Instructions == - * As autotools need to be run after most of the patches are applied, + * As autotools need to be run after most of the patches are applied, we do all the patching in spkg-source. * Deleting the following directories saves space: without doing this, the tarball can grow from under 3 megabytes to more than 7 diff --git a/build/pkgs/ecm/spkg-install b/build/pkgs/ecm/spkg-install index fc49b3d5754..964b32aa8c7 100755 --- a/build/pkgs/ecm/spkg-install +++ b/build/pkgs/ecm/spkg-install @@ -148,10 +148,10 @@ else # support (some of) the instructions emitted with this (e.g. the # Apple assembler doesn't know AVX yet). cat >foo.c <<-"EOF" - double d; - unsigned long fancy_insns() { return (unsigned long) d; } - int main () { return 0; } - EOF + double d; + unsigned long fancy_insns() { return (unsigned long) d; } + int main () { return 0; } + EOF if $CC -march=native -o foo foo.c &>/dev/null && ./foo >/dev/null; then cpu_params="-march=native" else diff --git a/build/pkgs/frobby/SPKG.txt b/build/pkgs/frobby/SPKG.txt index b135875b602..0ec7fe837d5 100644 --- a/build/pkgs/frobby/SPKG.txt +++ b/build/pkgs/frobby/SPKG.txt @@ -35,7 +35,7 @@ Frobby source distribution. * fix linking (rpath) === frobby-0.9.0.p1 (Dima Pasechnik, Sept 7, 2013) === - * added for getpid() + * added for getpid() === frobby-0.9.0 (Mike Hansen, May 24th, 2012) === * #13007: Update to 0.9.0. diff --git a/build/pkgs/future/SPKG.txt b/build/pkgs/future/SPKG.txt index fc2d036c685..c3fd24e9b50 100644 --- a/build/pkgs/future/SPKG.txt +++ b/build/pkgs/future/SPKG.txt @@ -17,7 +17,7 @@ from builtins import ( ascii, chr, hex, input, next, oct, open, pow, round, super, filter, map, zip) - + followed by predominantly standard, idiomatic Python 3 code that then runs similarly on Python 2.6/2.7 and Python 3.3+. diff --git a/build/pkgs/gap/spkg-install b/build/pkgs/gap/spkg-install index 840ba077f5a..a0f16928bf8 100755 --- a/build/pkgs/gap/spkg-install +++ b/build/pkgs/gap/spkg-install @@ -116,4 +116,4 @@ fi # Delete tests that rely on the non-GPL small group library rm "$INSTALL_DIR"/tst/testinstall/ctblsolv.tst rm "$INSTALL_DIR"/tst/testinstall/grppc.tst -rm "$INSTALL_DIR"/tst/testinstall/morpheus.tst +rm "$INSTALL_DIR"/tst/testinstall/morpheus.tst diff --git a/build/pkgs/gap_packages/spkg-install b/build/pkgs/gap_packages/spkg-install index ae499669f23..ecf1465b170 100755 --- a/build/pkgs/gap_packages/spkg-install +++ b/build/pkgs/gap_packages/spkg-install @@ -1,15 +1,15 @@ #!/usr/bin/env bash # WARNING -- if you add a package here, also add it to -# the gap_reset_workspace() command in +# the gap_reset_workspace() command in # /src/sage/interfaces/gap.py # -if [ -z "$SAGE_LOCAL" ]; then - echo >&2 "SAGE_LOCAL undefined ... exiting" - echo >&2 "Maybe run 'sage --sh'?" - exit 1 -fi +if [ -z "$SAGE_LOCAL" ]; then + echo >&2 "SAGE_LOCAL undefined ... exiting" + echo >&2 "Maybe run 'sage --sh'?" + exit 1 +fi GAP_DIR="$SAGE_LOCAL/gap/latest" PKG_DIR="$GAP_DIR/pkg" @@ -70,12 +70,12 @@ fi # Build GUAVA package cd "$PKG_DIR"/guava-3* && ./configure "$GAP_DIR" -if [ $? -ne 0 ]; then +if [ $? -ne 0 ]; then echo >&2 "Error configuring GUAVA packagae." exit 1 fi $MAKE -j1 -if [ $? -ne 0 ]; then +if [ $? -ne 0 ]; then echo >&2 "Error building GUAVA package." exit 1 fi diff --git a/build/pkgs/giac/SPKG.txt b/build/pkgs/giac/SPKG.txt index 478906de737..1a8624b99c1 100644 --- a/build/pkgs/giac/SPKG.txt +++ b/build/pkgs/giac/SPKG.txt @@ -11,7 +11,7 @@ $SAGE_LOCAL/share/giac/doc/en/cascmd_en/index.html * -Author's website with debian, ubuntu, macosx, windows package: - http://www-fourier.ujf-grenoble.fr/~parisse/giac.html + http://www-fourier.ujf-grenoble.fr/~parisse/giac.html -The Freebsd port is math/giacxcas == Licence == diff --git a/build/pkgs/giacpy_sage/SPKG.txt b/build/pkgs/giacpy_sage/SPKG.txt index 26445b9a331..37a49a2ec9a 100644 --- a/build/pkgs/giacpy_sage/SPKG.txt +++ b/build/pkgs/giacpy_sage/SPKG.txt @@ -3,19 +3,19 @@ == Description == * Giacpy is a cython frontend to the c++ library giac. This is the sage version. - * The sage version of giacpy after 0.6 is renamed to giacpy_sage + * The sage version of giacpy after 0.6 is renamed to giacpy_sage == Licence == GPLv2 or above == Upstream Contact == - + * Han Frederic: frederic.han@imj-prg.fr https://www.imj-prg.fr/~frederic.han/xcas/giacpy/ == Dependencies == - + * gmp, giac (the C++ library libgiac and headers) == Special Update/Build Instructions == diff --git a/build/pkgs/giacpy_sage/spkg-install b/build/pkgs/giacpy_sage/spkg-install index 187ce468db2..489973630cd 100755 --- a/build/pkgs/giacpy_sage/spkg-install +++ b/build/pkgs/giacpy_sage/spkg-install @@ -1,7 +1,7 @@ #!/usr/bin/env bash ########################################### -## Giacpy +## Giacpy ########################################### diff --git a/build/pkgs/git/spkg-check b/build/pkgs/git/spkg-check index a870cdf75c9..b952e145336 100755 --- a/build/pkgs/git/spkg-check +++ b/build/pkgs/git/spkg-check @@ -9,7 +9,7 @@ export GIT_TEST_HTTPD=false cd src echo "Testing git..." -$MAKE test +$MAKE test if [ $? -ne 0 ]; then echo >&2 "Error running git's test suite." exit 1 diff --git a/build/pkgs/glpk/SPKG.txt b/build/pkgs/glpk/SPKG.txt index 3636d43cbd9..5dfc5a169e0 100644 --- a/build/pkgs/glpk/SPKG.txt +++ b/build/pkgs/glpk/SPKG.txt @@ -36,16 +36,16 @@ http://www.gnu.org/software/glpk/#maintainer * GMP/MPIR * zlib -== Special Update/Build Instructions == - - * `configure` doesn't support specifying the location of the GMP - library to use; only `--with-gmp[=yes]` or `--with-gmp=no` - are valid options. (So we *have to* add Sage's include and - library directories to `CPPFLAGS` and `LDFLAGS`, respectively.) - * Do we need the `--disable-static`? The stand-alone solver presumably - runs faster when built with a static library; also other (stand-alone) - programs using it would. - (Instead, we should perhaps use `--enable-static --enable-shared` to +== Special Update/Build Instructions == + + * `configure` doesn't support specifying the location of the GMP + library to use; only `--with-gmp[=yes]` or `--with-gmp=no` + are valid options. (So we *have to* add Sage's include and + library directories to `CPPFLAGS` and `LDFLAGS`, respectively.) + * Do we need the `--disable-static`? The stand-alone solver presumably + runs faster when built with a static library; also other (stand-alone) + programs using it would. + (Instead, we should perhaps use `--enable-static --enable-shared` to go safe.) === Patches === diff --git a/build/pkgs/glpk/spkg-check b/build/pkgs/glpk/spkg-check index 0cade79147b..2e0f140678a 100755 --- a/build/pkgs/glpk/spkg-check +++ b/build/pkgs/glpk/spkg-check @@ -6,13 +6,13 @@ if [ -z "$SAGE_LOCAL" ]; then exit 1 fi -# Let GLPK use Sage's GMP/MPIR (cf. comments in SPKG.txt and spkg-install): -CPPFLAGS="-I$SAGE_LOCAL/include $CPPFLAGS" -LDFLAGS="-L$SAGE_LOCAL/lib $LDFLAGS" +# Let GLPK use Sage's GMP/MPIR (cf. comments in SPKG.txt and spkg-install): +CPPFLAGS="-I$SAGE_LOCAL/include $CPPFLAGS" +LDFLAGS="-L$SAGE_LOCAL/lib $LDFLAGS" -# No need to (re)export LDFLAGS etc., as `sage-env` does this. -# But it currently *doesn't* export CPPFLAGS. For safety, export them all: -export CPPFLAGS LDFLAGS +# No need to (re)export LDFLAGS etc., as `sage-env` does this. +# But it currently *doesn't* export CPPFLAGS. For safety, export them all: +export CPPFLAGS LDFLAGS cd src/ diff --git a/build/pkgs/graphs/SPKG.txt b/build/pkgs/graphs/SPKG.txt index b9076656dc3..63054c02ac4 100644 --- a/build/pkgs/graphs/SPKG.txt +++ b/build/pkgs/graphs/SPKG.txt @@ -8,7 +8,7 @@ Grout. Since April 2012 it also contains the ISGCI graph database. == Upstream Contact == * For ISGCI: - + H.N. de Ridder (hnridder@graphclasses.org) * For Andries Brouwer's database: diff --git a/build/pkgs/iml/spkg-install b/build/pkgs/iml/spkg-install index c246547f269..7e1daba1c03 100755 --- a/build/pkgs/iml/spkg-install +++ b/build/pkgs/iml/spkg-install @@ -38,7 +38,7 @@ fi --with-default="$SAGE_LOCAL" \ --with-cblas="$(pkg-config --libs cblas)" \ --with-cblas-include="$(pkg-config --cflags cblas)" \ - "$IML_CONFIGURE" + "$IML_CONFIGURE" if [ $? -ne 0 ]; then echo >&2 "Error configuring IML." exit 1 diff --git a/build/pkgs/jinja2/dependencies b/build/pkgs/jinja2/dependencies index 4c96a0f18f3..13f8a75c0fc 100644 --- a/build/pkgs/jinja2/dependencies +++ b/build/pkgs/jinja2/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) markupsafe docutils | setuptools pip +$(PYTHON) markupsafe docutils | setuptools pip ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jmol/SPKG.txt b/build/pkgs/jmol/SPKG.txt index 2a85d8acee4..4cfa4ed83d5 100644 --- a/build/pkgs/jmol/SPKG.txt +++ b/build/pkgs/jmol/SPKG.txt @@ -3,8 +3,8 @@ == Description == This provides files necessary for Jmol(java) and JSmol -(javascript) to operate from the command line and the -Notebook. It does not contain the Notebook javascript +(javascript) to operate from the command line and the +Notebook. It does not contain the Notebook javascript library jmol_lib.js or changes to Notebook or Sage code. == License == @@ -28,7 +28,7 @@ The commandline jmol requires java at runtime. First, unpack the upstream release (actual version number will of course differ): -$ unzip ~/Download/Jmol-14.2.4_2014.08.03-binary.zip +$ unzip ~/Download/Jmol-14.2.4_2014.08.03-binary.zip $ cd jmol-14.2.4_2014.08.03/ Extract and then delete the contained jsmol.zip diff --git a/build/pkgs/libgap/SPKG.txt b/build/pkgs/libgap/SPKG.txt index fd95cb5d3d5..fb01a436fc0 100644 --- a/build/pkgs/libgap/SPKG.txt +++ b/build/pkgs/libgap/SPKG.txt @@ -36,6 +36,6 @@ though. This scrip parses the GAP sources, identifies global identifiers, and adds a libGAP_ prefix to them to avoid symbol namespace collisions in Sage. -=== Patches === +=== Patches === None diff --git a/build/pkgs/lidia/spkg-install b/build/pkgs/lidia/spkg-install index 102db79e22a..482e39cd33c 100755 --- a/build/pkgs/lidia/spkg-install +++ b/build/pkgs/lidia/spkg-install @@ -27,7 +27,7 @@ if [ $? -ne 0 ]; then fi # LiDIA 2.2.0 installs its headers into lidia/ but expects them in LiDIA!?! -# So we make a symbolic link, just in case. +# So we make a symbolic link, just in case. # (On the Mac, nothing is done because of its case-preserving, case-insensitive file system.) ( cd "$SAGE_LOCAL/include" && if [ ! -r LiDIA ] ; then ln -s lidia LiDIA; fi || true ) diff --git a/build/pkgs/lie/SPKG.txt b/build/pkgs/lie/SPKG.txt index 3d77299997b..dba5cbdc69f 100644 --- a/build/pkgs/lie/SPKG.txt +++ b/build/pkgs/lie/SPKG.txt @@ -28,7 +28,7 @@ package and passed to the core of the system. This core consists of programs representing some 100 mathematical functions. The interpreter offers on-line facilities which explain operations and functions, and which give background information about Lie group theoretical concepts -and about currently valid definitions and values. +and about currently valid definitions and values. (from http://www-math.univ-poitiers.fr/~maavl/LiE/description.html ) diff --git a/build/pkgs/lrslib/SPKG.txt b/build/pkgs/lrslib/SPKG.txt index 95f734ce163..a940babecbb 100644 --- a/build/pkgs/lrslib/SPKG.txt +++ b/build/pkgs/lrslib/SPKG.txt @@ -2,7 +2,7 @@ == Description == -lrslib implements the linear reverse search algorithm of Avis and Fukuda. +lrslib implements the linear reverse search algorithm of Avis and Fukuda. See the homepage (http://cgm.cs.mcgill.ca/~avis/C/lrs.html) for details. diff --git a/build/pkgs/nauty/spkg-install b/build/pkgs/nauty/spkg-install index bb3c014f225..a5e419a6a1b 100755 --- a/build/pkgs/nauty/spkg-install +++ b/build/pkgs/nauty/spkg-install @@ -8,7 +8,7 @@ fi cd src -# Nauty doesn't have an install target +# Nauty doesn't have an install target # passing a prefix to configure is useless ./configure if [ $? -ne 0 ]; then diff --git a/build/pkgs/normaliz/SPKG.txt b/build/pkgs/normaliz/SPKG.txt index b8061f8eb76..5c090e4aa8e 100644 --- a/build/pkgs/normaliz/SPKG.txt +++ b/build/pkgs/normaliz/SPKG.txt @@ -35,7 +35,7 @@ For more details see http://www.mathematik.uni-osnabrueck.de/normaliz/ === Patches === - * no_static_stuff.patch - patching included into Makefile stuff that sets '-static' in CXXFLAGS + * no_static_stuff.patch - patching included into Makefile stuff that sets '-static' in CXXFLAGS == Changelog == @@ -58,7 +58,7 @@ For more details see http://www.mathematik.uni-osnabrueck.de/normaliz/ * added binary option to a patch call, as it now needs is === normaliz-2.8.p0 (Dima Pasechnik, December 2 2012) === - + * Bumped up the version due to a nontrivial patch to singular.lib === normaliz-2.8 (Andrey Novoseltsev, December 2 2012) === diff --git a/build/pkgs/notedown/SPKG.txt b/build/pkgs/notedown/SPKG.txt index 594d81b2361..66979f62c20 100644 --- a/build/pkgs/notedown/SPKG.txt +++ b/build/pkgs/notedown/SPKG.txt @@ -16,7 +16,7 @@ Home page: https://github.com/aaren/notedown == Dependencies == * Python -* setuptools +* setuptools * nbformat * nbconvert * six diff --git a/build/pkgs/ntl/spkg-install b/build/pkgs/ntl/spkg-install index af9aa7f1452..11309874282 100755 --- a/build/pkgs/ntl/spkg-install +++ b/build/pkgs/ntl/spkg-install @@ -128,18 +128,18 @@ ntl_configure() if $assembler_ok; then echo "Configuring NTL with NATIVE=on since the assembler appears to" - echo "be recent enough to support the instructions Sage's GCC emits." + echo "be recent enough to support the instructions Sage's GCC emits." DISABLE_NATIVE="NATIVE=on" else echo "Configuring NTL with NATIVE=off since we're using Sage's GCC" - echo "and the assembler might not support all instructions GCC emits." + echo "and the assembler might not support all instructions GCC emits." DISABLE_NATIVE="NATIVE=off" fi else echo "Configuring NTL with NATIVE=on (NTL might still disable it)." DISABLE_NATIVE="NATIVE=on" fi - + ./configure DEF_PREFIX="$SAGE_LOCAL" SHARED=on \ CXX="$CXX" CXXFLAGS="$CXXFLAGS $SHAREDFLAGS" \ LDFLAGS="$LDFLAGS" LIBTOOL_LINK_FLAGS="$LIBTOOL_LINK_FLAGS" \ diff --git a/build/pkgs/openblas/SPKG.txt b/build/pkgs/openblas/SPKG.txt index f9ba94fc1a8..b1ec2516b2f 100644 --- a/build/pkgs/openblas/SPKG.txt +++ b/build/pkgs/openblas/SPKG.txt @@ -16,6 +16,6 @@ OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version * OpenBLAS users mailing list: https://groups.google.com/forum/#!forum/openblas-users - + * OpenBLAS developers mailing list: https://groups.google.com/forum/#!forum/openblas-dev diff --git a/build/pkgs/openblas/write_pc_file.py b/build/pkgs/openblas/write_pc_file.py index 7695f73698d..c9ff09ecf08 100755 --- a/build/pkgs/openblas/write_pc_file.py +++ b/build/pkgs/openblas/write_pc_file.py @@ -27,11 +27,11 @@ if not os.path.isdir(pkgconfigdir): os.makedirs(pkgconfigdir) - + with open('package-version.txt') as f: package_version = f.read() - + def write_pc_file(target, libs, version): filename = os.path.join(pkgconfigdir, '{0}.pc'.format(target)) libflags=' '.join('-l{0}'.format(lib) for lib in libs) diff --git a/build/pkgs/openssl/spkg-install b/build/pkgs/openssl/spkg-install index 2200bf51ae6..e55b693000c 100755 --- a/build/pkgs/openssl/spkg-install +++ b/build/pkgs/openssl/spkg-install @@ -25,10 +25,10 @@ if [ "$UNAME" = "Darwin" ]; then # This check for 64-bit is taken from src/config. ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null` if [ "$ISA64" = "1" ]; then - # 64-bit - ./Configure darwin64-x86_64-cc --libdir=lib --prefix="$SAGE_LOCAL" --openssldir="$SAGE_LOCAL"/openssl shared + # 64-bit + ./Configure darwin64-x86_64-cc --libdir=lib --prefix="$SAGE_LOCAL" --openssldir="$SAGE_LOCAL"/openssl shared else - ./config --libdir=lib --prefix="$SAGE_LOCAL" --openssldir="$SAGE_LOCAL"/openssl shared + ./config --libdir=lib --prefix="$SAGE_LOCAL" --openssldir="$SAGE_LOCAL"/openssl shared fi else ./config --libdir=lib --prefix="$SAGE_LOCAL" --openssldir="$SAGE_LOCAL"/openssl shared diff --git a/build/pkgs/ore_algebra/SPKG.txt b/build/pkgs/ore_algebra/SPKG.txt index ba4c9df107d..6facb0dcfe3 100644 --- a/build/pkgs/ore_algebra/SPKG.txt +++ b/build/pkgs/ore_algebra/SPKG.txt @@ -2,12 +2,12 @@ == Description == -A Sage implementation of Ore algebras and Ore polynomials. +A Sage implementation of Ore algebras and Ore polynomials. Main features for the most common algebras include basic arithmetic and actions; gcrd and lclm; D-finite closure properties; natural transformations between related algebras; guessing; desingularization; solvers for polynomials, rational -functions and (generalized) power series. +functions and (generalized) power series. == License == diff --git a/build/pkgs/palp/spkg-install b/build/pkgs/palp/spkg-install index 1891aa4f233..9dead937d04 100755 --- a/build/pkgs/palp/spkg-install +++ b/build/pkgs/palp/spkg-install @@ -26,24 +26,24 @@ for dim in 4 5 6 11; do $MAKE CC="$CC" CFLAGS="$CFLAGS" if [ $? -ne 0 ]; then - echo "Error building PALP." - exit 1 + echo "Error building PALP." + exit 1 fi for file in poly class cws nef mori; do - cp -p ${file}.x "$SAGE_LOCAL"/bin/${file}-${dim}d.x - if [ $? -ne 0 ]; then - echo "Error installing PALP." - exit 1 - fi + cp -p ${file}.x "$SAGE_LOCAL"/bin/${file}-${dim}d.x + if [ $? -ne 0 ]; then + echo "Error installing PALP." + exit 1 + fi done # the next step is important to avert races on older file systems # for example, ext3 has 1-second timestamp granularity! $MAKE cleanall if [ $? -ne 0 ]; then - echo "Error building PALP." - exit 1 + echo "Error building PALP." + exit 1 fi done diff --git a/build/pkgs/pandoc_attributes/SPKG.txt b/build/pkgs/pandoc_attributes/SPKG.txt index d21b872df23..a06869d52f6 100644 --- a/build/pkgs/pandoc_attributes/SPKG.txt +++ b/build/pkgs/pandoc_attributes/SPKG.txt @@ -17,7 +17,7 @@ Home page: https://github.com/aaren/pandoc-attributes == Dependencies == * Python -* setuptools +* setuptools * pandocfilters == Special Update/Build Instructions == diff --git a/build/pkgs/pari/spkg-install b/build/pkgs/pari/spkg-install index 1938c51fa2a..de23f918aca 100755 --- a/build/pkgs/pari/spkg-install +++ b/build/pkgs/pari/spkg-install @@ -58,7 +58,7 @@ set_environment() # Pari ignores LDFLAGS when linking libpari-gmp.so, so we trick it: DLLDFLAGS="$LDFLAGS" export DLLDFLAGS - + # PARI does not build correctly with LD set (which is set by # sage-env). PARI actually needs LD set to a compiler to do the # linking, not to the linker directly. diff --git a/build/pkgs/pari_galdata/SPKG.txt b/build/pkgs/pari_galdata/SPKG.txt index c7100da29ba..049f93df73f 100644 --- a/build/pkgs/pari_galdata/SPKG.txt +++ b/build/pkgs/pari_galdata/SPKG.txt @@ -3,7 +3,7 @@ == Description == PARI package "galdata": Needed by polgalois to compute Galois group in -degrees 8 through 11. +degrees 8 through 11. == License == diff --git a/build/pkgs/pari_seadata_small/SPKG.txt b/build/pkgs/pari_seadata_small/SPKG.txt index 4db4fb26e5c..081dd5738b5 100644 --- a/build/pkgs/pari_seadata_small/SPKG.txt +++ b/build/pkgs/pari_seadata_small/SPKG.txt @@ -5,7 +5,7 @@ PARI package "seadata_small": Needed by ellap for large primes. This "small" one is a much smaller version that should be suitable for primes up to 350 bits. These polynomials were extracted from the ECHIDNA -databases and computed by David R. Kohel. +databases and computed by David R. Kohel. == License == diff --git a/build/pkgs/polymake/spkg-install b/build/pkgs/polymake/spkg-install index 3ec48e4c765..5dfe4f66867 100755 --- a/build/pkgs/polymake/spkg-install +++ b/build/pkgs/polymake/spkg-install @@ -29,7 +29,7 @@ fi --includedir="$SAGE_LOCAL"/include \ --bindir="$SAGE_LOCAL"/bin \ --libdir="$SAGE_LOCAL"/lib \ - $more_configure_options || die "Error configuring Polymake" + $more_configure_options || die "Error configuring Polymake" make || die "Error building polymake" # Remove old stuff. Polymake loads whatever it finds in # its installation directory. diff --git a/build/pkgs/ptyprocess/SPKG.txt b/build/pkgs/ptyprocess/SPKG.txt index c347787529d..173ccb9dee5 100644 --- a/build/pkgs/ptyprocess/SPKG.txt +++ b/build/pkgs/ptyprocess/SPKG.txt @@ -2,13 +2,13 @@ == Description == -Launch a subprocess in a pseudo terminal (pty), and interact with both the +Launch a subprocess in a pseudo terminal (pty), and interact with both the process and its pty. -Sometimes, piping stdin and stdout is not enough. There might be a password -prompt that doesn't read from stdin, output that changes when it's going to a -pipe rather than a terminal, or curses-style interfaces that rely on a terminal. -If you need to automate these things, running the process in a pseudo terminal +Sometimes, piping stdin and stdout is not enough. There might be a password +prompt that doesn't read from stdin, output that changes when it's going to a +pipe rather than a terminal, or curses-style interfaces that rely on a terminal. +If you need to automate these things, running the process in a pseudo terminal (pty) is the answer. == License == diff --git a/build/pkgs/qepcad/SPKG.txt b/build/pkgs/qepcad/SPKG.txt index bafc948fffd..1f1fc8c5543 100644 --- a/build/pkgs/qepcad/SPKG.txt +++ b/build/pkgs/qepcad/SPKG.txt @@ -11,7 +11,7 @@ QEPCAD B Copyright (c) 1990, 2008, Hoon Hong & Chris Brown (contact wcbrown@usna.edu) Permission to use, copy, modify, and/or distribute this software, including -source files, README files, etc., for any purpose with or without fee is +source files, README files, etc., for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. @@ -34,4 +34,4 @@ Website: http://www.usna.edu/CS/qepcadweb/B/QEPCAD.html == Special Update/Build Instructions == -One might need to set MAKE to "make -j1" fo this to be built successfully. +One might need to set MAKE to "make -j1" fo this to be built successfully. diff --git a/build/pkgs/qhull/SPKG.txt b/build/pkgs/qhull/SPKG.txt index 25352299925..ab514bc1f69 100644 --- a/build/pkgs/qhull/SPKG.txt +++ b/build/pkgs/qhull/SPKG.txt @@ -30,7 +30,7 @@ https://pypi.python.org/pypi/pyhull (see also documentation at http://pythonhost == Upstream Contact == C. Bradford Barber -bradb@shore.net +bradb@shore.net or qhull@qhull.org == Dependencies == diff --git a/build/pkgs/qhull/spkg-install b/build/pkgs/qhull/spkg-install index 2e9007c9b9d..7eff7226d07 100755 --- a/build/pkgs/qhull/spkg-install +++ b/build/pkgs/qhull/spkg-install @@ -10,12 +10,12 @@ cd src/ # Apply all patches for patch in ../patches/*.patch; do - echo "Applying $patch" - patch -p1 <"$patch" - if [ $? -ne 0 ]; then - echo >&2 "Error applying '$patch'" - return 1 - fi + echo "Applying $patch" + patch -p1 <"$patch" + if [ $? -ne 0 ]; then + echo >&2 "Error applying '$patch'" + return 1 + fi done $MAKE -j1 diff --git a/build/pkgs/r/spkg-install b/build/pkgs/r/spkg-install index 5b984fb0c75..d04badad924 100755 --- a/build/pkgs/r/spkg-install +++ b/build/pkgs/r/spkg-install @@ -135,12 +135,12 @@ export SAGE_BUILDING_R=yes config() { ./configure \ - --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" \ - --with-readline=yes \ - --with-x=$XSUPPORT \ - "$R_CONFIGURE_BLAS" \ - "$R_CONFIGURE_LAPACK" \ - $R_CONFIGURE + --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" \ + --with-readline=yes \ + --with-x=$XSUPPORT \ + "$R_CONFIGURE_BLAS" \ + "$R_CONFIGURE_LAPACK" \ + $R_CONFIGURE } config @@ -149,8 +149,8 @@ if [ $? -ne 0 ]; then XSUPPORT=no config if [ $? -ne 0 ]; then - echo >&2 "Error configuring R." - exit 1 + echo >&2 "Error configuring R." + exit 1 fi fi diff --git a/build/pkgs/readline/spkg-install b/build/pkgs/readline/spkg-install index c34b23c0ca9..d0147378d77 100755 --- a/build/pkgs/readline/spkg-install +++ b/build/pkgs/readline/spkg-install @@ -85,21 +85,21 @@ fi case "$UNAME" in Darwin) - DYLIB_NAME=libreadline.dylib;; + DYLIB_NAME=libreadline.dylib;; CYGWIN) - # It is of course very lame that readline names the file .dll.a, but that's what it does. - DYLIB_NAME=libreadline.dll.a;; + # It is of course very lame that readline names the file .dll.a, but that's what it does. + DYLIB_NAME=libreadline.dll.a;; OpenBSD) - # Untested. (David Kirkby, 11th November 2010) + # Untested. (David Kirkby, 11th November 2010) # Extension changed from 6.1 to 6.2; still untested. (October 2011) # Extension changed from 6.2 to 6.3; still untested. (June 2014) - DYLIB_NAME=libreadline.so.6.3;; + DYLIB_NAME=libreadline.so.6.3;; FreeBSD) - DYLIB_NAME=libreadline.so.6;; + DYLIB_NAME=libreadline.so.6;; HP-UX) - DYLIB_NAME=libreadline.sl.6;; + DYLIB_NAME=libreadline.sl.6;; *) # e.g. "Linux" or "SunOS" - DYLIB_NAME=libreadline.so + DYLIB_NAME=libreadline.so esac # Make sure that the install worked, despite whatever the diff --git a/build/pkgs/rw/spkg-install b/build/pkgs/rw/spkg-install index ebfe863eca2..3345698a23e 100755 --- a/build/pkgs/rw/spkg-install +++ b/build/pkgs/rw/spkg-install @@ -10,7 +10,7 @@ fi cd "src" ./configure --prefix="$SAGE_LOCAL" \ - --enable-executable=no && # no igraph dependency + --enable-executable=no && # no igraph dependency $MAKE && $MAKE install diff --git a/build/pkgs/saclib/SPKG.txt b/build/pkgs/saclib/SPKG.txt index aa6bbcd4c05..9f95fb6bf90 100644 --- a/build/pkgs/saclib/SPKG.txt +++ b/build/pkgs/saclib/SPKG.txt @@ -11,7 +11,7 @@ Saclib 2.2 Copyright (c) 1993, 2008, RISC-Linz (contact wcbrown@usna.edu) Permission to use, copy, modify, and/or distribute this software, including -source files, README files, etc., for any purpose with or without fee is +source files, README files, etc., for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. diff --git a/build/pkgs/scipoptsuite/spkg-install b/build/pkgs/scipoptsuite/spkg-install index 8bd23964d50..09015704878 100755 --- a/build/pkgs/scipoptsuite/spkg-install +++ b/build/pkgs/scipoptsuite/spkg-install @@ -143,7 +143,7 @@ fi cd $SRC/$SCIP_DIR # for clp add the option LPS=clp -## added -rpath. Abusing LIBBUILD_o is of course a hack. +## added -rpath. Abusing LIBBUILD_o is of course a hack. $MAKE OPT=$OPT LPSOPT=$OPT VERBOSE=true SHARED=true ZIMPL=false GMP=true ZLIB=true READLINE=true \ USRCFLAGS="$CFLAGS" USRCXXFLAGS="$CXXFLAGS" USRLDFLAGS="$LDFLAGS" \ LIBBUILD_o="-Wl,-rpath,$SAGE_LOCAL/lib -lgmp -lz -lreadline -o " \ diff --git a/build/pkgs/singular/spkg-src b/build/pkgs/singular/spkg-src index d34874f978f..9f2db3336ca 100755 --- a/build/pkgs/singular/spkg-src +++ b/build/pkgs/singular/spkg-src @@ -43,7 +43,7 @@ if [ -z "$UPSTREAM_SOURCE_DIRECTORY" ]; then # The following is inspired from make_tar.sh #sh make_tar.sh #begin make_tar.sh - git checkout "$SINGULAR_GIT_COMMIT" + git checkout "$SINGULAR_GIT_COMMIT" git checkout-index -a -f --prefix=singular-$DOTVERSION/ rm singular-$DOTVERSION/.gdbinit singular-$DOTVERSION/*/.gdbinit singular-$DOTVERSION/*/*/.gdbinit singular-$DOTVERSION/*/*/*/.gdbinit rm singular-$DOTVERSION/IntegerProgramming/README diff --git a/build/pkgs/topcom/SPKG.txt b/build/pkgs/topcom/SPKG.txt index b2021935faf..51772f4a3b8 100644 --- a/build/pkgs/topcom/SPKG.txt +++ b/build/pkgs/topcom/SPKG.txt @@ -1,8 +1,8 @@ = TOPCOM = -== Description == +== Description == TOPCOM is a collection of clients to compute Triangulations Of Point -Configurations and Oriented Matroids, resp. +Configurations and Oriented Matroids, resp. The algorithms use only combinatorial data of the point configuration as is given by its oriented matroid. Some basic commands for computing @@ -17,10 +17,10 @@ GPL v2 == Upstream Contact == Prof. Dr. Jörg Rambau -Lehrstuhl für Wirtschaftsmathematik -Raum FAN-D.1.29 (Sekretariat: FAN-D.1.30) -Universität Bayreuth -D-95440 Bayreuth +Lehrstuhl für Wirtschaftsmathematik +Raum FAN-D.1.29 (Sekretariat: FAN-D.1.30) +Universität Bayreuth +D-95440 Bayreuth Germany Tel: +49-921-55-7350, Fax: +49-921-55-7352 http://www.rambau.wm.uni-bayreuth.de diff --git a/build/pkgs/topcom/spkg-src b/build/pkgs/topcom/spkg-src index 25768e0096d..5f771490f13 100755 --- a/build/pkgs/topcom/spkg-src +++ b/build/pkgs/topcom/spkg-src @@ -8,7 +8,7 @@ shopt -s extglob TOPCOM_VERSION=0.17.7 -if [ -z "$TOPCOM_KEEP" ] ; then +if [ -z "$TOPCOM_KEEP" ] ; then # Remove old sources and download new rm -rf src tar xzf <( curl http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-$TOPCOM_VERSION.tar.gz ) diff --git a/src/bin/sage b/src/bin/sage index 2f18d916608..cb9a37fd6fe 100755 --- a/src/bin/sage +++ b/src/bin/sage @@ -432,15 +432,15 @@ fi ##################################################################### if [ "$1" = '-dumpversion' -o "$1" = '--dumpversion' ]; then - . "$SAGE_LOCAL"/bin/sage-version.sh - echo ${SAGE_VERSION} - exit 0 + . "$SAGE_LOCAL"/bin/sage-version.sh + echo ${SAGE_VERSION} + exit 0 fi if [ "$1" = '-v' -o "$1" = '-version' -o "$1" = '--version' ]; then - . "$SAGE_LOCAL"/bin/sage-version.sh - echo "SageMath version ${SAGE_VERSION}, Release Date: ${SAGE_RELEASE_DATE}" - exit 0 + . "$SAGE_LOCAL"/bin/sage-version.sh + echo "SageMath version ${SAGE_VERSION}, Release Date: ${SAGE_RELEASE_DATE}" + exit 0 fi if [ "$1" = '-root' -o "$1" = '--root' ]; then diff --git a/src/bin/sage-env b/src/bin/sage-env index 03ddb265b16..54c07837e01 100644 --- a/src/bin/sage-env +++ b/src/bin/sage-env @@ -271,10 +271,10 @@ export SAGE_SRC="$SAGE_ROOT/src" export SAGE_DOC_SRC="$SAGE_SRC/doc" export SAGE_DOC="$SAGE_SHARE/doc/sage" -if [ -z "${SAGE_ORIG_PATH_SET}" ]; then - SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH - SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET -fi +if [ -z "${SAGE_ORIG_PATH_SET}" ]; then + SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH + SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET +fi export PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH" # We offer a toolchain option, so if $SAGE_LOCAL/toolchain/toolchain-env exists source it. @@ -337,8 +337,8 @@ if [ -z "$SAGE_REPO_ANONYMOUS" ]; then export SAGE_REPO_ANONYMOUS fi if [ -z "$SAGE_REPO_AUTHENTICATED" ]; then - SAGE_REPO_AUTHENTICATED="ssh://git@trac.sagemath.org:2222/sage.git" - export SAGE_REPO_AUTHENTICATED + SAGE_REPO_AUTHENTICATED="ssh://git@trac.sagemath.org:2222/sage.git" + export SAGE_REPO_AUTHENTICATED fi if [ -z "$SAGE_DISTFILES" ]; then SAGE_DISTFILES="$SAGE_ROOT/upstream" @@ -445,27 +445,27 @@ if [ -d "$SAGE_LOCAL/lib/R/share" ] ; then R_MAKEVARS_SITE="$SAGE_LOCAL/lib/R/share/Makevars.site" && export R_MAKEVARS_SITE if ! [ -f "$R_MAKEVARS_SITE" ] ; then if ! [ -a "$R_MAKEVARS_SITE" ] ; then - echo "## Empty site-wide Makevars file for Sage's R" > "$R_MAKEVARS_SITE" + echo "## Empty site-wide Makevars file for Sage's R" > "$R_MAKEVARS_SITE" else - >&2 echo "Warning: $R_MAKEVARS_SITE exists and is not a file : trouble ahead..." + >&2 echo "Warning: $R_MAKEVARS_SITE exists and is not a file : trouble ahead..." fi fi fi if [ -d "$DOT_SAGE" ] ; then if ! [ -d "$DOT_SAGE/R" ] ; then - if ! [ -a "$DOT_SAGE/R" ] ; then - mkdir -p "$DOT_SAGE/R" - else - >&2 echo "Warning: $DOT_SAGE/R exists and is not a directory : trouble ahead..." - fi + if ! [ -a "$DOT_SAGE/R" ] ; then + mkdir -p "$DOT_SAGE/R" + else + >&2 echo "Warning: $DOT_SAGE/R exists and is not a directory : trouble ahead..." + fi fi R_MAKEVARS_USER="$DOT_SAGE/R/Makevars.user" && export R_MAKEVARS_USER if ! [ -f "$R_MAKEVARS_USER" ] ; then - if ! [ -a "$R_MAKEVARS_USER" ] ; then - echo "## Empty user-specific Makevars file for Sage's R" > "$R_MAKEVARS_USER" - else - >&2 echo "Warning: $R_MAKEVARS_USER exists and is not a file : trouble ahead..." - fi + if ! [ -a "$R_MAKEVARS_USER" ] ; then + echo "## Empty user-specific Makevars file for Sage's R" > "$R_MAKEVARS_USER" + else + >&2 echo "Warning: $R_MAKEVARS_USER exists and is not a file : trouble ahead..." + fi fi fi export MAXIMA_PREFIX="$SAGE_LOCAL" diff --git a/src/bin/sage-fix-pkg-checksums b/src/bin/sage-fix-pkg-checksums index e3139a8ba90..34a12b60cd8 100755 --- a/src/bin/sage-fix-pkg-checksums +++ b/src/bin/sage-fix-pkg-checksums @@ -9,7 +9,7 @@ if [ $# -eq 0 ]; then sage --package fix-checksum else for tarball in "$@" ; do - pkg=$(sage --package name $tarball) - sage --package fix-checksum $pkg + pkg=$(sage --package name $tarball) + sage --package fix-checksum $pkg done fi From b7d7a71bf1b97f67235ca1737b6cc07c94ce7ecc Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer Date: Tue, 1 Nov 2016 20:27:44 +0100 Subject: [PATCH 2/2] Don't use <<- here documents --- build/pkgs/ecm/spkg-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/pkgs/ecm/spkg-install b/build/pkgs/ecm/spkg-install index 964b32aa8c7..abea99e020e 100755 --- a/build/pkgs/ecm/spkg-install +++ b/build/pkgs/ecm/spkg-install @@ -147,11 +147,11 @@ else # The compiler supports '-march=native', but the assembler might not # support (some of) the instructions emitted with this (e.g. the # Apple assembler doesn't know AVX yet). - cat >foo.c <<-"EOF" + cat >foo.c </dev/null && ./foo >/dev/null; then cpu_params="-march=native" else