From acf94eef7e0161790f7d6e180e0702d17c8941e9 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 20 Nov 2015 22:40:23 -0500 Subject: [PATCH] create_tarball: cleanup whitespace errors No code / logic changes. --- contrib/nightly/create_tarball.sh | 62 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) mode change 100755 => 100644 contrib/nightly/create_tarball.sh diff --git a/contrib/nightly/create_tarball.sh b/contrib/nightly/create_tarball.sh old mode 100755 new mode 100644 index 31f8186a70..ea7a3e2abc --- a/contrib/nightly/create_tarball.sh +++ b/contrib/nightly/create_tarball.sh @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -70,13 +70,13 @@ send_error_mail() { rm -f "$outfile" touch "$outfile" for file in `/bin/ls $logdir/* | sort`; do - len="`wc -l $file | awk '{ print $1}'`" - if test "`expr $len \> $max_log_len`" = "1"; then - echo "[... previous lines snipped ...]" >> "$outfile" - tail -n $max_log_len "$file" >> "$outfile" - else - cat "$file" >> "$outfile" - fi + len="`wc -l $file | awk '{ print $1}'`" + if test "`expr $len \> $max_log_len`" = "1"; then + echo "[... previous lines snipped ...]" >> "$outfile" + tail -n $max_log_len "$file" >> "$outfile" + else + cat "$file" >> "$outfile" + fi done Mail -s "=== CREATE FAILURE ($version) ===" "$email" < "$outfile" rm -f "$outfile" @@ -101,16 +101,16 @@ do_command() { logfile="$logdir/20-command.txt" rm -f "$logfile" if test -n "$debug"; then - echo "*** Running command: $cmd" - eval $cmd > "$logfile" 2>&1 - st=$? - echo "*** Command complete: exit status: $st" + echo "*** Running command: $cmd" + eval $cmd > "$logfile" 2>&1 + st=$? + echo "*** Command complete: exit status: $st" else - eval $cmd > "$logfile" 2>&1 - st=$? + eval $cmd > "$logfile" 2>&1 + st=$? fi if test "$st" != "0"; then - cat > "$logdir/15-error.txt" < "$logdir/15-error.txt" < "$logdir/25-error.txt" < "$logdir/25-error.txt" < latest_snapshot.txt for ext in gz bz2; do count="`ls openmpi*.tar.$ext | wc -l | awk '{ print $1 }'`" if test "`expr $count \> $max_snapshots`" = "1"; then - num_old="`expr $count - $max_snapshots`" - old="`ls -rt openmpi*.tar.$ext | head -n $num_old`" - rm -f $old + num_old="`expr $count - $max_snapshots`" + old="`ls -rt openmpi*.tar.$ext | head -n $num_old`" + rm -f $old fi done