From 07b83a836c180b73279267b47cca0c2e5929bbd2 Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Sun, 18 Feb 2018 15:03:16 +0100
Subject: [PATCH] Move code to check service update marker file into separate
 function.

Refers to #28, #13
---
 Updater/Update-Service.ps1 | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Updater/Update-Service.ps1 b/Updater/Update-Service.ps1
index 345175c..4bd8024 100644
--- a/Updater/Update-Service.ps1
+++ b/Updater/Update-Service.ps1
@@ -333,11 +333,11 @@ function Copy-ServiceFiles {
 
 
 function Update-ServiceBinaries {
-    $MarkerFile = "$($UpdPathMarkerFiles)\$($env:COMPUTERNAME)"
-    if (Test-Path "$MarkerFile" -Type Leaf) {
-        Log-Debug "Found marker [$($MarkerFile)], not updating service."
+    $NewService = NewServiceBinaries-Available
+    if (-Not ($NewService)) {
         Return $False
     }
+
     Stop-TrayApp
     Copy-ServiceFiles
     try {
@@ -351,6 +351,16 @@ function Update-ServiceBinaries {
     Return $True
 }
 
+function NewServiceBinaries-Available {
+    $MarkerFile = "$($UpdPathMarkerFiles)\$($env:COMPUTERNAME)"
+    if (Test-Path "$MarkerFile" -Type Leaf) {
+        Log-Debug "Found marker [$($MarkerFile)], not updating service."
+        Return $False
+    }
+    Write-Verbose "Marker [$($MarkerFile)] missing, service should be updated!"
+    Return $True
+}
+
 
 function Upload-LogFiles {
     $Dest = "$($UploadPathLogs)\$($env:COMPUTERNAME)"
-- 
GitLab