From c4ee840fb688a2dc60e32e937c708403b0c1e930 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Fri, 19 Jun 2020 13:10:41 +0100
Subject: [PATCH] [misc] fix Coverity upload - Take 3

* It was a missing @ sign for --form file=
---
 appveyor.yml | 17 ++++-------------
 src/rufus.c  |  1 +
 src/rufus.rc | 10 +++++-----
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9b1103c6..e54cbaa1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,6 +21,9 @@ environment:
   global:
     BITS: 32
   matrix:
+  - CONFIGURATION: Release
+    COMPILER: Coverity
+    PLATFORM: x86
   - CONFIGURATION: Debug
     COMPILER: MSVC
     PLATFORM: x86
@@ -39,9 +42,6 @@ environment:
   - CONFIGURATION: Release
     COMPILER: MinGW
     PLATFORM: x86_64
-  - CONFIGURATION: Release
-    COMPILER: Coverity
-    PLATFORM: x86
 
 init:
 # Set the AppVeyor build version number to our tag or, if untagged, to the commit hash
@@ -82,16 +82,7 @@ build_script:
         }
         cov-build.exe --dir cov-int msbuild rufus.sln /m /p:Configuration=$env:CONFIGURATION,Platform=$env:PLATFORM /l:$APPVEYOR_LOGGER;
         7z a -r cov-int.zip cov-int
-        $curlArguments = @(
-          '--form email=%COVERITY_SCAN_EMAIL%',
-          '--form token=%COVERITY_SCAN_TOKEN%',
-          '--form file=cov-int.zip',
-          '--form version="%APPVEYOR_BUILD_VERSION%"',
-          '--form description="Rufus"',
-          'https://scan.coverity.com/builds?project=pbatard%2Frufus'
-        )
-        $curlArgumentList = [System.Environment]::ExpandEnvironmentVariables($curlArguments)
         # MUST use 'curl.exe' since 'curl' is a PowerShell alias to Invoke-Webrequest
-        curl.exe $curlArgumentList
+        curl.exe --form email=$env:COVERITY_SCAN_EMAIL --form token=$env:COVERITY_SCAN_TOKEN  --form file=@cov-int.zip --form version="$env:APPVEYOR_BUILD_VERSION" --form description="Rufus" https://scan.coverity.com/builds?project=pbatard%2Frufus
       }
     }
diff --git a/src/rufus.c b/src/rufus.c
index 171a0e30..57e4a77a 100755
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -22,6 +22,7 @@
 #include <crtdbg.h>
 #endif
 
+
 #include <windows.h>
 #include <windowsx.h>
 #include <stdlib.h>
diff --git a/src/rufus.rc b/src/rufus.rc
index 24afda2a..366d6cb7 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.11.1681"
+CAPTION "Rufus 3.11.1682"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,11,1681,0
- PRODUCTVERSION 3,11,1681,0
+ FILEVERSION 3,11,1682,0
+ PRODUCTVERSION 3,11,1682,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.11.1681"
+            VALUE "FileVersion", "3.11.1682"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.11.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.11.1681"
+            VALUE "ProductVersion", "3.11.1682"
         END
     END
     BLOCK "VarFileInfo"