From 3deb2ef363c50f87dd2cd34af79cc606e12f4f7e Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Wed, 4 May 2016 22:07:48 +0100
Subject: [PATCH] fix NSIS when branches contain slashes

---
 distribution/windows/install.nsi | 2 +-
 scripts/ps/publish.ps1           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/distribution/windows/install.nsi b/distribution/windows/install.nsi
index 768f104e7b..3c91d2b454 100644
--- a/distribution/windows/install.nsi
+++ b/distribution/windows/install.nsi
@@ -41,7 +41,7 @@ Name "${APPNAMEANDVERSION} ${APPBITS}-bit for Windows ${EXTRA_VERSION}"
 ; NOTE: Keep trailing backslash!
 InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenRCT2" "Install Folder"
 !ifndef OUTFILE
-	!define OUTFILE "openrct2-${APPVERSION}-${APPARCH}.exe"
+	!define OUTFILE "openrct2-install.exe"
 !endif
 OutFile "${OUTFILE}"
 CRCCheck force
diff --git a/scripts/ps/publish.ps1 b/scripts/ps/publish.ps1
index ed2d4288da..9c42f240e8 100644
--- a/scripts/ps/publish.ps1
+++ b/scripts/ps/publish.ps1
@@ -18,17 +18,17 @@ param (
     [switch]$Symbols      = $false
 )
 
-if ($GitTag -eq "")
+if (-not $GitTag)
 {
-    if ($GitBranch -eq $null)
+    if (-not $GitBranch)
     {
         $GitBranch = (git rev-parse --abbrev-ref HEAD)
     }
-    if ($GitCommitSha1 -eq $null)
+    if (-not $GitCommitSha1)
     {
         $GitCommitSha1 = (git rev-parse HEAD)
     }
-    if ($GitCommitSha1Short -eq $null)
+    if (-not $GitCommitSha1Short)
     {
         $GitCommitSha1Short = (git rev-parse --short HEAD)
     }