Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/cppcheck/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/cppcheck/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/cppcheck/install.sh (revision 13249) @@ -14,7 +14,7 @@ #compile cd src -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/cmake/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/cmake/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/cmake/install.sh (revision 13249) @@ -18,7 +18,7 @@ #Compile cmake cd install ./bootstrap --prefix=$ISSM_DIR/externalpackages/cmake/install -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-snowleopard.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-snowleopard.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-snowleopard.sh (revision 13249) @@ -26,7 +26,7 @@ --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" #make -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-snowleopard.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-snowleopard.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-snowleopard.sh (revision 13249) @@ -25,7 +25,7 @@ ./configure --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" #make -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-linux64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-linux64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-linux64.sh (revision 13249) @@ -23,7 +23,7 @@ --prefix="$ISSM_DIR/externalpackages/python/install" \ --enable-shared -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-lion.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-lion.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-lion.sh (revision 13249) @@ -26,7 +26,7 @@ #./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install" #make -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-linux64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-linux64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-linux64.sh (revision 13249) @@ -23,7 +23,7 @@ --prefix="$ISSM_DIR/externalpackages/python/install" \ --enable-shared -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh (revision 13249) @@ -21,7 +21,7 @@ cd src ./configure \ --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/apr/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/apr/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/apr/install.sh (revision 13249) @@ -22,7 +22,7 @@ ./configure --prefix="$ISSM_DIR/externalpackages/apr/install" #Compile and install apr -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.3.1-linux64-berg.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.3.1-linux64-berg.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.3.1-linux64-berg.sh (revision 13249) @@ -1,9 +1,6 @@ #!/bin/bash set -eu -#Get number of cpus -NUMCPUS=$1; - #version of mpich2 #version=1.0.2p1 version=1.3.1 @@ -40,11 +37,11 @@ fi #Compile mpich2 -if [ -z $NUMCPUS ]; +if [ $# -eq 0 ]; then make else - make -j $NUMCPUS + make -j $1 fi make install Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh (revision 13249) @@ -29,7 +29,7 @@ --enable-fc #Compile mpich2 -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh (revision 13249) @@ -31,7 +31,7 @@ patch -R ./src/include/mpicxx.h ../configs/1.0.2/linux64/mpicxx.h.patch #Compile mpich2 -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh (revision 13249) @@ -31,7 +31,7 @@ patch -R ./src/include/mpicxx.h ../configs/1.0.2/altix64/mpicxx.h.patch #Compile mpich2 -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh (revision 13249) @@ -27,7 +27,7 @@ --enable-f91=gfortran #Compile mpich2 -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh (revision 13249) @@ -30,7 +30,7 @@ patch -R ./src/include/mpicxx.h ../configs/1.0.2/macosx32/mpicxx.h.patch #Compile mpich2 -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh (revision 13249) @@ -28,7 +28,7 @@ patch -R ./src/include/mpicxx.h ../configs/1.0.2/win32/mpicxx.h.patch #Compile mpich2 -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh (revision 13249) @@ -29,7 +29,7 @@ --enable-fc #Compile mpich2 -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/freetype/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/freetype/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/freetype/install.sh (revision 13249) @@ -22,7 +22,7 @@ sudo ./configure #Compile and install freetype -if [ -z $1 ]; then +if [ $# -eq 0 ]; then sudo make else sudo make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gmake/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gmake/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gmake/install.sh (revision 13249) @@ -21,7 +21,7 @@ #Configure and compile: ./configure --prefix=$ISSM_DIR/externalpackages/gmake/install -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make make install else Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/shapelib/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/shapelib/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/shapelib/install.sh (revision 13249) @@ -25,7 +25,7 @@ # Build shapelib and run self-tests cd src -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/lapack/install-linux64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/lapack/install-linux64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/lapack/install-linux64.sh (revision 13249) @@ -20,7 +20,7 @@ cp ../configs/linux64/make.inc ./ #Compile and install lapack -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make lib else make -j $1 lib Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/adic/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/adic/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/adic/install.sh (revision 13249) @@ -26,7 +26,7 @@ --with-xaifbooster=$ISSM_DIR/externalpackages/xaifbooster/xaifBooster \ --with-colpack=$ISSM_DIR/externalpackages/colpack/install\ --prefix=$ISSM_DIR/externalpackages/adic/install -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install-macosx64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install-macosx64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install-macosx64.sh (revision 13249) @@ -31,7 +31,7 @@ --disable-dependency-tracking #Compile and install modules -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/rose/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/rose/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/rose/install.sh (revision 13249) @@ -22,7 +22,7 @@ --with-boost=$ISSM_DIR/externalpackages/boost/install\ --srcdir=$ISSM_DIR/externalpackages/rose/source -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/colpack/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/colpack/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/colpack/install.sh (revision 13249) @@ -15,7 +15,7 @@ #compile cd src -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/chaco/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/chaco/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/chaco/install.sh (revision 13249) @@ -23,7 +23,7 @@ # Build chaco cd src/code -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/doxygen/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/doxygen/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/doxygen/install.sh (revision 13249) @@ -9,7 +9,7 @@ #Configure doxygen cd install && ./configure --prefix "$ISSM_DIR/externalpackages/doxygen/install" -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl/install.sh (revision 13249) @@ -28,7 +28,7 @@ if [[ $sudochoice == "0" ]]; then ./configure --prefix=$ISSM_DIR/externalpackages/tcl/install - if [ -z $1 ]; then + if [ $# -eq 0 ]; then make else make -j $1 @@ -40,7 +40,7 @@ if [[ $sudochoice == "1" ]]; then sudo ./configure - if [ -z $1 ]; then + if [ $# -eq 0 ]; then sudo make else sudo make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/hdf5/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/hdf5/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/hdf5/install.sh (revision 13249) @@ -19,7 +19,7 @@ #Configure and compile cd src ./configure --prefix="$ISSM_DIR/externalpackages/hdf5/install" -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/sqlite/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/sqlite/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/sqlite/install.sh (revision 13249) @@ -22,7 +22,7 @@ ./configure --prefix="$ISSM_DIR/externalpackages/sqlite/install" #Compile and install sqlite-autoconf -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/swig/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/swig/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/swig/install.sh (revision 13249) @@ -29,7 +29,7 @@ --with-python="$ISSM_DIR/externalpackages/python/install/bin/python" #Compile and install gdal -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/adolc/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/adolc/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/adolc/install.sh (revision 13249) @@ -19,7 +19,6 @@ mv ADOL-C-2.2.0/* src rm -rf ADOL-C-2.2.0 - #Compile ADOL-C cd src @@ -35,7 +34,7 @@ --enable-addexa \ --disable-shave -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 @@ -53,11 +52,9 @@ done #remake: -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 fi make install - - Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/graphviz/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/graphviz/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/graphviz/install.sh (revision 13249) @@ -22,7 +22,7 @@ #Compile and install cd src -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/apr-util/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/apr-util/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/apr-util/install.sh (revision 13249) @@ -22,7 +22,7 @@ ./configure --prefix="$ISSM_DIR/externalpackages/apr-util/install" --with-apr="$ISSM_DIR/externalpackages/apr/install" #Compile and install apr-util -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-macosx64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-macosx64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-macosx64.sh (revision 13249) @@ -1,9 +1,6 @@ #!/bin/bash set -eu -#Get number of cpus -NUMCPUS=$1; - #Some cleanup rm -rf Dakota rm -rf src @@ -84,13 +81,13 @@ #Compile and install dakota cd src -if [ -z $NUMCPUS ]; +if [ $# -eq 0 ]; then make make install else - make -j $NUMCPUS - make -j $NUMCPUS install + make -j $1 + make -j $1 install fi cd .. Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-pleiades.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-pleiades.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-pleiades.sh (revision 13249) @@ -1,9 +1,6 @@ #!/bin/bash set -eu -#Get number of cpus -NUMCPUS=$1; - #Some cleanup rm -rf Dakota rm -rf src @@ -84,13 +81,13 @@ #Compile and install dakota cd src -if [ -z $NUMCPUS ]; +if [ $# -eq 0 ]; then make make install else - make -j $NUMCPUS - make -j $NUMCPUS install + make -j $1 + make -j $1 install fi cd .. Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-altix64-cosmos.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-altix64-cosmos.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-altix64-cosmos.sh (revision 13249) @@ -1,9 +1,6 @@ #!/bin/bash set -eu -#Get number of cpus -NUMCPUS=$1; - #Some cleanup rm -rf Dakota rm -rf src @@ -84,13 +81,13 @@ #Compile and install dakota cd src -if [ -z $NUMCPUS ]; +if [ $# -eq 0 ]; then make make install else - make -j $NUMCPUS - make -j $NUMCPUS install + make -j $1 + make -j $1 install fi cd .. Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-linux64-astrid.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-linux64-astrid.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-linux64-astrid.sh (revision 13249) @@ -1,9 +1,6 @@ #!/bin/bash set -eu -#Get number of cpus -NUMCPUS=$1; - #Some cleanup rm -rf Dakota rm -rf src @@ -84,13 +81,13 @@ #Compile and install dakota cd src -if [ -z $NUMCPUS ]; +if [ $# -eq 0 ]; then make make install else - make -j $NUMCPUS - make -j $NUMCPUS install + make -j $1 + make -j $1 install fi cd .. Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-linux64-murdo.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-linux64-murdo.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-linux64-murdo.sh (revision 13249) @@ -1,9 +1,6 @@ #!/bin/bash set -eu -#Get number of cpus -NUMCPUS=$1; - #Some cleanup rm -rf Dakota rm -rf src @@ -84,13 +81,13 @@ #Compile and install dakota cd src -if [ -z $NUMCPUS ]; +if [ $# -eq 0 ]; then make make install else - make -j $NUMCPUS - make -j $NUMCPUS install + make -j $1 + make -j $1 install fi cd .. Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-discover.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-discover.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/dakota/install-discover.sh (revision 13249) @@ -1,9 +1,6 @@ #!/bin/bash set -eu -#Get number of cpus -NUMCPUS=$1; - #Some cleanup rm -rf Dakota rm -rf src @@ -84,13 +81,13 @@ #Compile and install dakota cd src -if [ -z $NUMCPUS ]; +if [ $# -eq 0 ]; then make make install else - make -j $NUMCPUS - make -j $NUMCPUS install + make -j $1 + make -j $1 install fi cd .. Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/oofem/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/oofem/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/oofem/install.sh (revision 13249) @@ -23,7 +23,7 @@ #Compile oofem cd targets/oofem-2.0 -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/slepc/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/slepc/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/slepc/install.sh (revision 13249) @@ -18,7 +18,7 @@ #Make slepc cd install ./config/configure.py -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/svn/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/svn/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/svn/install.sh (revision 13249) @@ -25,7 +25,7 @@ --with-sqlite="$ISSM_DIR/externalpackages/sqlite/install" #Compile and install subversion -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal/install.sh (revision 13249) @@ -33,7 +33,7 @@ patch GDALmake.opt ../GDALmake.opt.patch #Compile and install gdal -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal/install-murdo.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal/install-murdo.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal/install-murdo.sh (revision 13249) @@ -31,7 +31,7 @@ patch GDALmake.opt ../GDALmake.opt.patch #Compile and install gdal -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tk/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tk/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tk/install.sh (revision 13249) @@ -25,7 +25,7 @@ if [[ $sudochoice == "0" ]]; then ./configure --prefix=$ISSM_DIR/externalpackages/tk/install - if [ -z $1 ]; then + if [ $# -eq 0 ]; then make else make -j $1 @@ -37,7 +37,7 @@ if [[ $sudochoice == "1" ]]; then sudo ./configure - if [ -z $1 ]; then + if [ $# -eq 0 ]; then sudo make else sudo make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave/install.sh (revision 13249) @@ -21,11 +21,11 @@ --prefix=$ISSM_DIR/externalpackages/octave/install \ --disable-readline -if [ -z $NUMCPUS ]; +if [ $# -eq 0 ]; then make make install else - make -j $NUMCPUS - make -j $NUMCPUS install + make -j $1 + make -j $1 install fi Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-macosx64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-macosx64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-macosx64.sh (revision 13249) @@ -24,7 +24,7 @@ --prefix="$ISSM_DIR/externalpackages/gsl/install" #Compile gsl -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-pleiades.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-pleiades.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-pleiades.sh (revision 13249) @@ -22,7 +22,7 @@ --prefix="$ISSM_DIR/externalpackages/gsl/install" #Compile gsl -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-linux64.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-linux64.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-linux64.sh (revision 13249) @@ -22,7 +22,7 @@ --prefix="$ISSM_DIR/externalpackages/gsl/install" #Compile gsl -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-android.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-android.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-android.sh (revision 13249) @@ -35,7 +35,7 @@ #Compile gsl if [[ $step == "3" || $step == "0" ]]; then - if [ -z $1 ]; then + if [ $# -eq 0 ]; then make $j else make -j $j Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/esmf/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/esmf/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/esmf/install.sh (revision 13249) @@ -32,7 +32,7 @@ #Compile and install esmf - if [ -z $1 ]; then + if [ $# -eq 0 ]; then make make install else @@ -43,7 +43,7 @@ if [[ $install == "2" ]]; then cd esmf - if [ -z $1 ]; then + if [ $# -eq 0 ]; then make all_tests else make -j $1 all_tests Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.2.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.2.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.2.sh (revision 13249) @@ -22,7 +22,7 @@ ./configure \ --prefix="$ISSM_DIR/externalpackages/netcdf/install" \ --disable-doxygen -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.0.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.0.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.0.sh (revision 13249) @@ -19,7 +19,7 @@ #Configure and compile cd src ./configure --prefix="$ISSM_DIR/externalpackages/netcdf/install" -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx/install.sh (revision 13249) @@ -24,7 +24,7 @@ --with-tcl=$ISSM_DIR/externalpackages/tcl/install/Library/Frameworks/Tcl.framework #Compile and install tclx -if [ -z $1 ]; then +if [ $# -eq 0 ]; then make else make -j $1 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/libpng/install.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/libpng/install.sh (revision 13248) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/libpng/install.sh (revision 13249) @@ -22,7 +22,7 @@ sudo ./configure #Compile and install libpng -if [ -z $1 ]; then +if [ $# -eq 0 ]; then sudo make else sudo make -j $1