From 52821c1da55a786538fb0b7083d864bb5f2d2931 Mon Sep 17 00:00:00 2001
From: Grzegorz Lachowski <gregolsky@ravendb.net>
Date: Fri, 15 Dec 2017 08:27:32 +0100
Subject: [PATCH] RavenDB-9540 Prepare build scripts for RTM - upload scripts

---
 scripts/upload.ps1 | 16 +++++++++++-----
 upload.ps1         |  3 +++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/scripts/upload.ps1 b/scripts/upload.ps1
index 482d65889a3a..c6d402b9dbaa 100644
--- a/scripts/upload.ps1
+++ b/scripts/upload.ps1
@@ -1,21 +1,27 @@
 # TODO @gregolsky update regexes for stable
 $CATEGORIES = @(
-    @('RavenDB-[0-9]\.[0-9]\.[0-9]-[a-zA-Z]+-([0-9-]+)-windows-x64', "RavenDB for Windows x64"),
-    @('RavenDB-[0-9]\.[0-9]\.[0-9]-[a-zA-Z]+-([0-9-]+)-windows-x86', "RavenDB for Windows x86"),
-    @('RavenDB-[0-9]\.[0-9]\.[0-9]-[a-zA-Z]+-([0-9-]+)-linux-x64', "RavenDB for Linux x64"),
-    @('RavenDB-[0-9]\.[0-9]\.[0-9]-[a-zA-Z]+-([0-9-]+)-osx-x64', "RavenDB for OSX"),
-    @('RavenDB-[0-9]\.[0-9]\.[0-9]-[a-zA-Z]+-([0-9-]+)-raspberry-pi', "RavenDB for Raspberry Pi")
+    @('RavenDB-[0-9]\.[0-9]\.[0-9](-[a-zA-Z]+-([0-9-]+))?-windows-x64', "RavenDB for Windows x64"),
+    @('RavenDB-[0-9]\.[0-9]\.[0-9](-[a-zA-Z]+-([0-9-]+))?-windows-x86', "RavenDB for Windows x86"),
+    @('RavenDB-[0-9]\.[0-9]\.[0-9](-[a-zA-Z]+-([0-9-]+))?-linux-x64', "RavenDB for Linux x64"),
+    @('RavenDB-[0-9]\.[0-9]\.[0-9](-[a-zA-Z]+-([0-9-]+))?-osx-x64', "RavenDB for OSX"),
+    @('RavenDB-[0-9]\.[0-9]\.[0-9](-[a-zA-Z]+-([0-9-]+))?-raspberry-pi', "RavenDB for Raspberry Pi")
 )
 function Get-UploadCategory ( $filename ) {
     $result = [io.path]::GetFilenameWithoutExtension($filename)
+    $foundCategory = $null;
     foreach ($category in $CATEGORIES) {
         $categoryPattern = $category[0]
         if ($filename -match $categoryPattern) {
             $result = $category[1]
+            $foundCategory = $category[1]
             break
         }
     }
 
+    if ([string]::IsNullOrEmpty($foundCategory)) {
+        throw "Could not determine category for $filename."
+    }
+
     $result
 }
 
diff --git a/upload.ps1 b/upload.ps1
index 853abef6cac5..1327cd19969d 100644
--- a/upload.ps1
+++ b/upload.ps1
@@ -14,4 +14,7 @@ $uploader = [io.path]::combine($projectDir, '..', 'Uploader', 'S3Uploader.exe')
 $versionInfo = GetVersionInfo
 $files = Get-ChildItem $ARTIFACTS
 
+$filesString = $files -join "`r`n"
+write-host "Found artifacts: `r`n$filesString"
+
 Upload "$uploader" $versionInfo $files $DryRun