make es_mpiexec posix-sh compliant

espressomd · Sep 15, 2014 · 14795ff · 14795ff
1 parent 0712ba9
commit 14795ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,6 @@ matrix:
 
 before_script:
   - if [[ $MPI = with ]]; then export CXX=mpic++; fi #there is MPICXX, but CXX overwrites it, so let's see CXX 
-  - sudo update-alternatives --install /bin/sh sh /bin/bash 100 # es_mpiexec does not work in dash, so let's use bash
 
 script: #Travis' cython is too old to compile the python-interface
   - ./bootstrap.sh &&

diff --git a/tools/es_mpiexec.in b/tools/es_mpiexec.in
@@ -76,7 +76,7 @@ if test "x$MYMPIEXEC" = "x"; then
     reason=170
 elif test -x "$MYMPIEXEC"; then
     mpiexec=$MYMPIEXEC
-elif command -v "$MPIEXEC" >&/dev/null 2>&1; then
+elif command -v "$MPIEXEC" >/dev/null 2>&1; then
 # POSIX compatible check if a program exists, without knowing its path
     mpiexec=$MPIEXEC
 else
@@ -85,7 +85,7 @@ else
 fi
 
 # and execute, if possible
-if command -v "$mpiexec" >&/dev/null 2>&1; then
+if command -v "$mpiexec" >/dev/null 2>&1; then
 
    exec $mpiexec "$@"