installer/windows: batch file improvements

Jenkinsfile

@@ -23,7 +23,7 @@ node('node') {
 
         unstash "storagenode-binaries"
 
-        bat 'installer\\windows\\build.bat'
+        bat 'installer\\windows\\buildrelease.bat'
 
         stash name: "storagenode-installer", includes: "release/**/storagenode*.msi"
 

installer/windows/build.bat

@@ -1,12 +1,24 @@
-rem set the TAG env var from the release dir
-for /f %%i in ('dir /B release') do set TAG=%%i
+@echo off
+
+rem count # of args
+set argC=0
+for %%x in (%*) do Set /A argC+=1
+
+if not "%argC%"=="3" (
+    echo usage: %~nx0 ^<storagenode.exe input path^> ^<storagenode-updater.exe input path^> ^<msi output path^>
+    exit /B 1
+)
 
 rem copy the storagenode binaries to the installer project
-copy release\%TAG%\storagenode_windows_amd64.exe installer\windows\storagenode.exe
-copy release\%TAG%\storagenode-updater_windows_amd64.exe installer\windows\storagenode-updater.exe
+copy %1 installer\windows\storagenode.exe
+copy %2 installer\windows\storagenode-updater.exe
 
 rem build the installer
 msbuild installer\windows\windows.sln /t:Build /p:Configuration=Release
 
+rem cleanup copied binaries
+del installer\windows\storagenode.exe
+del installer\windows\storagenode-updater.exe
+
 rem copy the MSI to the release dir
-copy installer\windows\bin\Release\storagenode.msi release\%TAG%\storagenode_windows_amd64.msi
+copy installer\windows\bin\Release\storagenode.msi %3

installer/windows/buildrelease.bat

@@ -0,0 +1,6 @@
+@echo off
+
+rem build msi installer for each release directory
+for /d %%d in (release\*) do (
+    call %~dp0build.bat %%d\storagenode_windows_amd64.exe %%d\storagenode-updater_windows_amd64.exe %%d\storagenode_windows_amd64.msi
+)

installer/windows/install.bat

@@ -0,0 +1,17 @@
+@echo off
+
+rem count # of args
+set argC=0
+for %%x in (%*) do Set /A argC+=1
+
+if not "%argC%"=="1" (
+    echo usage: %~nx0 ^<msi path^>
+    exit /B 1
+)
+
+rem uninstall existing storagenode product
+echo uninstalling storagenode
+msiexec /uninstall %1
+
+echo installing storagenode from %1
+msiexec /i %1 /passive /qb /norestart /log %~dp1install.log STORJ_WALLET="0x0000000000000000000000000000000000000000" STORJ_EMAIL="user@mail.example" STORJ_PUBLIC_ADDRESS="127.0.0.1:10000"

installer/windows/installrelease.bat

@@ -0,0 +1,7 @@
+@echo off
+
+rem NB: only installs from *first* release directory
+for /d %%d in (release\*) do (
+    call %~dp0install.bat %%d\storagenode_windows_amd64.msi
+	goto :EOF
+)