mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix NSIS when branches contain slashes

This commit is contained in:
Ted John 2016-05-04 22:07:48 +01:00
parent e29c2555c3
commit 3deb2ef363
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distribution/windows/install.nsi
View File

@ -41,7 +41,7 @@ Name "${APPNAMEANDVERSION} ${APPBITS}-bit for Windows ${EXTRA_VERSION}"
; NOTE: Keep trailing backslash! ; NOTE: Keep trailing backslash!
InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenRCT2" "Install Folder" InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenRCT2" "Install Folder"
!ifndef OUTFILE !ifndef OUTFILE
!define OUTFILE "openrct2-${APPVERSION}-${APPARCH}.exe" !define OUTFILE "openrct2-install.exe"
!endif !endif
OutFile "${OUTFILE}" OutFile "${OUTFILE}"
CRCCheck force CRCCheck force

8
scripts/ps/publish.ps1
View File

@ -18,17 +18,17 @@ param (
[switch]$Symbols = $false [switch]$Symbols = $false
) )
if ($GitTag -eq "") if (-not $GitTag)
{ {
if ($GitBranch -eq $null) if (-not $GitBranch)
{ {
$GitBranch = (git rev-parse --abbrev-ref HEAD) $GitBranch = (git rev-parse --abbrev-ref HEAD)
} }
if ($GitCommitSha1 -eq $null) if (-not $GitCommitSha1)
{ {
$GitCommitSha1 = (git rev-parse HEAD) $GitCommitSha1 = (git rev-parse HEAD)
} }
if ($GitCommitSha1Short -eq $null) if (-not $GitCommitSha1Short)
{ {
$GitCommitSha1Short = (git rev-parse --short HEAD) $GitCommitSha1Short = (git rev-parse --short HEAD)
} }