From 90a3c0bdf7ebcd719dc5fa5fb9b9ddb232c354ae Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 28 Jan 2020 19:24:59 -0500
Subject: [PATCH] omit newlines in mitm monitor file

---
 automation/roles/mitmproxy/files/mitmdump_monitor.sh          | 4 ++--
 .../user_block/{hn => hn_test}/bubbleApp_userBlock_hn.json    | 0
 .../{hn => hn_test}/bubbleApp_userBlock_hn_data.json          | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename bubble-server/src/test/resources/models/apps/user_block/{hn => hn_test}/bubbleApp_userBlock_hn.json (100%)
 rename bubble-server/src/test/resources/models/apps/user_block/{hn => hn_test}/bubbleApp_userBlock_hn_data.json (100%)

diff --git a/automation/roles/mitmproxy/files/mitmdump_monitor.sh b/automation/roles/mitmproxy/files/mitmdump_monitor.sh
index a6089862..3f76edbf 100644
--- a/automation/roles/mitmproxy/files/mitmdump_monitor.sh
+++ b/automation/roles/mitmproxy/files/mitmdump_monitor.sh
@@ -17,12 +17,12 @@ ROOT_KEY_MARKER=/usr/share/bubble/mitmdump_monitor
 
 # Start with MITM proxy turned off
 if [[ ! -f ${BUBBLE_MITM_MARKER} ]] ; then
-  echo off > ${BUBBLE_MITM_MARKER} && chown bubble ${BUBBLE_MITM_MARKER}
+  echo -n off > ${BUBBLE_MITM_MARKER} && chown bubble ${BUBBLE_MITM_MARKER}
 fi
 if [[ ! -f ${ROOT_KEY_MARKER} ]] ; then
   sleep 1s
   mkdir -p "$(dirname ${ROOT_KEY_MARKER})" && chmod 755 "$(dirname ${ROOT_KEY_MARKER})"
-  echo on > ${ROOT_KEY_MARKER} && touch ${ROOT_KEY_MARKER} && chmod 644 ${ROOT_KEY_MARKER}
+  echo -n on > ${ROOT_KEY_MARKER} && touch ${ROOT_KEY_MARKER} && chmod 644 ${ROOT_KEY_MARKER}
 fi
 
 function ensureMitmOn {
diff --git a/bubble-server/src/test/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json b/bubble-server/src/test/resources/models/apps/user_block/hn_test/bubbleApp_userBlock_hn.json
similarity index 100%
rename from bubble-server/src/test/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json
rename to bubble-server/src/test/resources/models/apps/user_block/hn_test/bubbleApp_userBlock_hn.json
diff --git a/bubble-server/src/test/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn_data.json b/bubble-server/src/test/resources/models/apps/user_block/hn_test/bubbleApp_userBlock_hn_data.json
similarity index 100%
rename from bubble-server/src/test/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn_data.json
rename to bubble-server/src/test/resources/models/apps/user_block/hn_test/bubbleApp_userBlock_hn_data.json