From 33070eae799ed89cacc939a2392d0ddca343ac9c Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Thu, 1 Aug 2019 01:02:03 +0000
Subject: [PATCH] Update golds

---
 basice2e/clients.goldoutput/client18.out | 5 -----
 basice2e/clients.goldoutput/client45.out | 2 --
 basice2e/clients.goldoutput/client56.out | 2 --
 basice2e/clients.goldoutput/client67.out | 2 --
 basice2e/clients.goldoutput/client74.out | 2 --
 basice2e/clients.goldoutput/client9.out  | 5 -----
 basice2e/run.sh                          | 2 +-
 7 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/basice2e/clients.goldoutput/client18.out b/basice2e/clients.goldoutput/client18.out
index 9e4a7eb..5b11217 100644
--- a/basice2e/clients.goldoutput/client18.out
+++ b/basice2e/clients.goldoutput/client18.out
@@ -1,6 +1 @@
 Received: Hello, 18, with E2E Encryption
-Received: Hello, 18, with E2E Encryption
-Received: Hello, 18, with E2E Encryption
-Received: Hello, 18, with E2E Encryption
-Received: Hello, 18, with E2E Encryption
-Received: Hello, 18, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client45.out b/basice2e/clients.goldoutput/client45.out
index 4c9f492..364c8e1 100644
--- a/basice2e/clients.goldoutput/client45.out
+++ b/basice2e/clients.goldoutput/client45.out
@@ -1,4 +1,2 @@
-Sending Message to 5, Ben: Hello, 5
 Message from 7, Rick Received: Hello, 4
 Sending Message to 5, Ben: Hello, 5
-Message from 7, Rick Received: Hello, 4
diff --git a/basice2e/clients.goldoutput/client56.out b/basice2e/clients.goldoutput/client56.out
index 7a98704..1384be5 100644
--- a/basice2e/clients.goldoutput/client56.out
+++ b/basice2e/clients.goldoutput/client56.out
@@ -1,4 +1,2 @@
-Sending Message to 6, Steph: Hello, 6
 Message from 4, Jim Received: Hello, 5
 Sending Message to 6, Steph: Hello, 6
-Message from 4, Jim Received: Hello, 5
diff --git a/basice2e/clients.goldoutput/client67.out b/basice2e/clients.goldoutput/client67.out
index 0fba43b..37a4dcd 100644
--- a/basice2e/clients.goldoutput/client67.out
+++ b/basice2e/clients.goldoutput/client67.out
@@ -1,4 +1,2 @@
-Sending Message to 7, Rick: Hello, 7
 Message from 5, Ben Received: Hello, 6
 Sending Message to 7, Rick: Hello, 7
-Message from 5, Ben Received: Hello, 6
diff --git a/basice2e/clients.goldoutput/client74.out b/basice2e/clients.goldoutput/client74.out
index 73e0990..05887b8 100644
--- a/basice2e/clients.goldoutput/client74.out
+++ b/basice2e/clients.goldoutput/client74.out
@@ -1,4 +1,2 @@
-Sending Message to 4, Jim: Hello, 4
 Message from 6, Steph Received: Hello, 7
 Sending Message to 4, Jim: Hello, 4
-Message from 6, Steph Received: Hello, 7
diff --git a/basice2e/clients.goldoutput/client9.out b/basice2e/clients.goldoutput/client9.out
index 8e6c366..71a5485 100644
--- a/basice2e/clients.goldoutput/client9.out
+++ b/basice2e/clients.goldoutput/client9.out
@@ -1,6 +1 @@
 Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 1ec4037..7942729 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -176,7 +176,7 @@ head -10 $CLIENTCLEAN/client18_rekey.out > $CLIENTCLEAN/client18.out || true
 rm $CLIENTCLEAN/client9_rekey.out $CLIENTCLEAN/client18_rekey.out || true
 
 for C in $(ls -1 $CLIENTCLEAN); do
-    sort -o $CLIENTCLEAN/$C tmp || true
+    sort -o tmp $CLIENTCLEAN/$C  || true
     uniq tmp $CLIENTCLEAN/$C || true
 done
 
-- 
GitLab