From 457dcb7fa555e7dd0fc5debf1ed9c0ad18efc88c Mon Sep 17 00:00:00 2001
From: Matthew Shillam <matthew@shillam.me.uk>
Date: Thu, 18 Oct 2018 23:50:30 +0100
Subject: [PATCH] Fix stupid variable clash %OS%

---
 duplicati_install_script/setup_duplicati.bat | 56 ++++++++++++--------
 id_miltonkeynes                              | 18 -------
 id_miltonkeynes.pub                          |  1 -
 3 files changed, 35 insertions(+), 40 deletions(-)
 delete mode 100644 id_miltonkeynes
 delete mode 100644 id_miltonkeynes.pub

diff --git a/duplicati_install_script/setup_duplicati.bat b/duplicati_install_script/setup_duplicati.bat
index 47f6063..3ce2e10 100644
--- a/duplicati_install_script/setup_duplicati.bat
+++ b/duplicati_install_script/setup_duplicati.bat
@@ -58,13 +58,13 @@ cls
     )
 
 
-    REM Check OS type 32Bit or 64Bit and install the relevant Visual Code 2017 C++ Redistributable....
-    reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS=32Bit || set OS=64Bit
 
-    if %OS%==64Bit (
+    reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OSTYPE=32Bit || set OSTYPE=64Bit
+
+    if %OSTYPE%==64Bit (
         reg query HKEY_CLASSES_ROOT\Installer\Dependencies\,,amd64,14.0,bundle  1>NUL || "%~dp0bin\vc_redist.x64.exe" /norestart
     )
-    if %OS%==32Bit (
+    if %OSTYPE%==32Bit (
         reg query HKEY_CLASSES_ROOT\Installer\Dependencies\,,x86,14.0,bundle  1>NUL || "%~dp0bin\vc_redist.x32.exe" /norestart
     )
 
@@ -84,28 +84,40 @@ cls
     IF "%OS%"=="Windows_NT" SET NUL=
     echo.
     echo ---------------------------------------------------------------------------
+    SET "PROGRAMFOLDER=C:\Program Files\Duplicati 2\"
     IF EXIST "C:\Program Files (x86)\Duplicati 2\%NUL%" ( SET "PROGRAMFOLDER=C:\Program Files (x86)\Duplicati 2\" )& echo  Program path is: "C:\Program Files (x86)\Duplicati 2\"
-    IF EXIST "C:\Program Files\Duplicati 2\%NUL%" (SET "PROGRAMFOLDER=C:\Program Files\Duplicati 2\")& echo  Program path is: "C:\Program Files\Duplicati 2\"
-    REM IF "%PROGRAMFOLDER%" == "" echo Software was not installed... time to debug!& GOTO EXITNOW
-    echo .
+    IF EXIST "C:\Program Files\Duplicati 2\%NUL%" ( SET "PROGRAMFOLDER=C:\Program Files\Duplicati 2\")& echo  Program path is: "C:\Program Files\Duplicati 2\"
+    
+
+
+
+:SERVICECHECK
+
+    Set ServiceName=Duplicati
+
+    SC QUERY %ServiceName% > NUL
+    IF ERRORLEVEL 1060 GOTO SETUPSERVICE
+
+    echo %ServiceName% service already installed, skipping service install...
+    echo.
+    GOTO STARTSERVICE
+
 
 
 :SETUPSERVICE
-
-Set ServiceName=Duplicati
-
-SC QUERY %ServiceName% > NUL
-    echo %ServiceName% service already installed, skipping service install...
-    echo .
-    GOTO :GETCLIENTNAME
-
-SC queryex "%ServiceName%"|Find "STATE"|Find /v "RUNNING">Nul&&(
-    echo %ServiceName% not installed...
-    echo Install and starting %ServiceName% ...
-
+    
     set "execpath=%PROGRAMFOLDER%\Duplicati.WindowsService.exe"
     "%execpath%" install --webservice-interface=127.0.0.1 --webservice-port=8200 --portable-mode
     echo .
+    GOTO STARTSERVICE
+
+
+
+:STARTSERVICE
+
+    SC queryex "%ServiceName%"|Find "STATE"|Find /v "RUNNING">Nul&&(
+    echo %ServiceName% not running...
+    echo Starting %ServiceName%...
 
     NET start "%ServiceName%">nul||(
         Echo "%ServiceName%" wont start 
@@ -152,7 +164,8 @@ SC queryex "%ServiceName%"|Find "STATE"|Find /v "RUNNING">Nul&&(
 	"%~dp0bin\duplicati_client.exe" create backup "%~dp0bin\schedule-documents-%CLIENTNAME%.json"
 	"%~dp0bin\duplicati_client.exe" create backup "%~dp0bin\schedule-xrays-%CLIENTNAME%.json"
 
-goto SORTCHORTCUTS
+    goto SORTCHORTCUTS
+
 
 
 :SORTCHORTCUTS
@@ -165,6 +178,7 @@ goto SORTCHORTCUTS
     xcopy "%~dp0bin\Duplicati 2 start.lnk" "%USERPROFILE%\Desktop"
 	
 
+
 :EXITNOW
     echo.
     echo.
@@ -177,6 +191,6 @@ goto SORTCHORTCUTS
 
     echo. & echo %date% %time% - %~nx0 ended & echo.
 
-Cmd /k
+    Cmd /k
 
 :EXITCLOSE
\ No newline at end of file
diff --git a/id_miltonkeynes b/id_miltonkeynes
deleted file mode 100644
index 909864c..0000000
--- a/id_miltonkeynes
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,52AF6C8726C8A64C6FD4C780589E2AA8
-
-i5qgRF8XHK35toRcQwv0iiMkDLaQK2gd2XBk3iuaZDQ5aL2QbJf3dH011FO9kqhG
-dgsiNh2BTE9qLIlMSbzHVBq2n8k39+p7D1h/2KKEg9FK8N9QK1z6blIQEqbvLNNr
-X+KAJBkKH5HovKKLdeRPHmcRPx+wbMFaxiMZAr8+5SHW9WwcE5mKa8VB6Jg2REVW
-9252WTCgYqJ/O4ytami3WgXRkaFr1VbD+evfckor26kndV88wNVNJgHOhI9PQtGA
-ex9SZQ5c2kvbgHg97mb8vx5i7mrfQGaLW3N5iaAUdf6AB9VbTrg+T2ssJFuhKjyt
-1DCfF0mKbuvBxJgWhHtGH0hyKYopJB4zP2IgdwrSsVSf8A1Dmww0Hf+NwX88stKp
-vc+y04WO09JxB+1VLCFELFzJdIiXtUQjPMSKViiitKYlpmtVSOcrCCtXqBw7VEvc
-rqGGVRdWAUkKnNYBDj/p3RT8RB5AI67riY6kxoJEeEEpbJh93aEkm6TKkMBd6nQs
-z4pgcTv8gYPzrSOUxMtSzVX9cy7Ud1lQrvPgkRtq58ellMg0OcLYxLS2R0my9Nkj
-sNenMcGlxCQQGeUeJO4IYMy0Iy6IC3hbHQVKecRYNZTbtD4b0SopbjyE2H8QHhx/
-zcgN50rqTLmdWOqt4+kq9KRuhsdQ6ZvaYZzq3AJ6krlKECILyV4BFoliBN4Y/iHC
-/SJliXyid2QxvzmYn27owawjBSpyIJ4fs97EAf/Wiovs+gJDKVOXiQQtJhWRyTZD
-Jv5GSSabEOdrvy0z4S4Ung11X0/vN6zNJs+aH5AmZn/68WVtgGJJM53kEN0ZYIad
------END RSA PRIVATE KEY-----
diff --git a/id_miltonkeynes.pub b/id_miltonkeynes.pub
deleted file mode 100644
index 9ee5426..0000000
--- a/id_miltonkeynes.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDD76WGmS2v6mdagQchURuyUVUUBY9VxrzxsL/4Bp3JlPzL/3vqbmE1uWqji3y34Lh/66kS2qtY+S/aMz5e8J4xVvcS4Ux/7i4fHnyf8JGP6bjgdz0FeDZFkZ4COBY+fa9wn14/4I8pzo0HfIKrOuQTim6L8umcpvwj6g9xeFVj9Q== mat@MacBook-Pro.local