diff --git a/setupScriptInfo.ps1 b/setupScriptInfo.ps1 index 201e6ae..4a7e4ba 100644 --- a/setupScriptInfo.ps1 +++ b/setupScriptInfo.ps1 @@ -170,8 +170,8 @@ function InstallExe { New-Item -Path $targetPath -ItemType Directory } $appFilePath = Join-Path $tmpPath $app - Copy-Item -Path $appFilePath -Destination $targetPath -Force - createShortcut -exe $appFilePath -app $appName + Copy-Item -Path (Join-Path $tmpPath $app) -Destination $targetPath -Force + createShortcut -exe (Join-Path $targetPath $app) -app $appName } function InstallZipSetup { @@ -182,7 +182,7 @@ function InstallZipSetup { $zipName = [System.IO.Path]::GetFileNameWithoutExtension($zip) Write-Host "Installing $zipName..." Expand-Archive -Path (Join-Path $tmpPath $zip) -DestinationPath $tmpPath -Force - Start-Process -FilePath $(Join-Path $tmpPath $zipName $exe) -ArgumentList "/allusers /s" -Wait + Start-Process -FilePath $(Join-Path -Path $tmpPath -ChildPath (Join-Path -Path $zipName -ChildPath $exe)) -ArgumentList "/allusers /s" -Wait } function InstallZip { @@ -197,7 +197,7 @@ function InstallZip { if (-not $zipName.Equals($app)) { Move-Item -Path (Join-Path $env:ProgramFiles $zipName) -Destination (Join-Path $env:ProgramFiles $app) } - createShortcut -exe $(Join-Path $env:ProgramFiles $app $exe) -app $app + createShortcut -exe $(Join-Path -Path $env:ProgramFiles -ChildPath (Join-Path -Path $app -ChildPath $exe)) -app $app } function createShortcut {