From 2bca60be9d182fa68ff4e9d4a9d5658d012dbe16 Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Thu, 19 Jul 2018 08:38:47 +0100
Subject: [PATCH] Fix broadcast flush issue.

---
 src/main/bash/sdkman-flush.sh                       |  3 ++-
 src/test/groovy/sdkman/steps/broadcast_steps.groovy | 10 ++++++++++
 src/test/groovy/sdkman/steps/flush_steps.groovy     |  9 ---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/bash/sdkman-flush.sh b/src/main/bash/sdkman-flush.sh
index 22a04248..7f9a1bd1 100644
--- a/src/main/bash/sdkman-flush.sh
+++ b/src/main/bash/sdkman-flush.sh
@@ -21,7 +21,8 @@ function __sdk_flush {
 
 	case "$qualifier" in
 		broadcast)
-			if [[ -f "${SDKMAN_DIR}/var/broadcast" ]]; then
+			if [[ -f "${SDKMAN_DIR}/var/broadcast_id" ]]; then
+				rm "${SDKMAN_DIR}/var/broadcast_id"
 				rm "${SDKMAN_DIR}/var/broadcast"
 				__sdkman_echo_green "Broadcast has been flushed."
 			else
diff --git a/src/test/groovy/sdkman/steps/broadcast_steps.groovy b/src/test/groovy/sdkman/steps/broadcast_steps.groovy
index 2ac7d25b..1eac024e 100644
--- a/src/test/groovy/sdkman/steps/broadcast_steps.groovy
+++ b/src/test/groovy/sdkman/steps/broadcast_steps.groovy
@@ -16,4 +16,14 @@ And(~'^a new Broadcast "(.*)" with id "(.*)" is available$') { String broadcast,
 And(~'^a prior Broadcast "(.*)" with id "(.*)" was issued$') { String broadcast, String id ->
     broadcastIdFile.write id
     broadcastFile.write broadcast
+}
+
+And(~'^no broadcast message can be found$') {->
+    assert !broadcastIdFile.exists()
+    assert !broadcastFile.exists()
+}
+
+And(~'^the broadcast has been flushed$') { ->
+    broadcastIdFile.delete()
+    broadcastFile.delete()
 }
\ No newline at end of file
diff --git a/src/test/groovy/sdkman/steps/flush_steps.groovy b/src/test/groovy/sdkman/steps/flush_steps.groovy
index b5082676..847ea0dc 100644
--- a/src/test/groovy/sdkman/steps/flush_steps.groovy
+++ b/src/test/groovy/sdkman/steps/flush_steps.groovy
@@ -10,10 +10,6 @@ And(~'^no candidates are know locally$') {->
     assert ! candidatesFile.exists()
 }
 
-And(~'^no broadcast message can be found$') {->
-    assert ! (broadcastFile.exists() && broadcastIdFile.exists())
-}
-
 And(~'^the archive "([^"]*)" has been cached$') { String archive ->
     new File(archiveDir, archive).createNewFile()
 }
@@ -30,11 +26,6 @@ And(~'^no "([^"]*)" file is present in temporary storage$') { String fileName ->
     assert ! new File(tmpDir, fileName).exists()
 }
 
-And(~'^the broadcast has been flushed$') {->
-    broadcastIdFile.delete()
-    broadcastFile.delete()
-}
-
 And(~'^a prior version "([^"]*)" was detected$') { String version ->
     assert versionFile.exists()
     assert versionFile.text.contains(version)