AMPI: Eliminate cp -n from scripts

Author: evan-charmworks

src/libs/ck-libs/ampi/ampiCC

@@ -229,6 +229,6 @@ Do $CHARMBIN/charmc -default-to-aout $ARGS $AMPICC_POST_OPTS $ROMIO
 status=$?
 
 # Copy ampirun, but do not overwrite it if it already exists.
-[ $status -eq 0 ] && cp -n $CHARMBIN/ampirun .
+[[ $status -eq 0 && ! -f "ampirun" ]] && cp -f "$CHARMBIN/ampirun" .
 
 exit $status

src/libs/ck-libs/ampi/ampif90

@@ -7,7 +7,7 @@ ORIGIN='\$ORIGIN'
 export AMPICC="$(basename $0)"
 export AMPICC_MODE='ampif'
 
-cp -n $CHARMBIN/../include/mpif.h .
+[[ ! -f "mpif.h" ]] && cp -f "$CHARMBIN/../include/mpif.h" .
 $CHARMBIN/ampiCC "$@"
 status=$?
 /bin/rm -f mpif.h