From 567e1abe841ba83b640d953ce6abffa95cf516fd Mon Sep 17 00:00:00 2001 From: ole Date: Mon, 2 Oct 2017 22:56:43 +0200 Subject: [PATCH] fixed setup.ps1 to work with an external powershell (outside of VScode) --- README.md | 2 +- setup.ps1 | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 1dcd21e..8dcc67a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ## AdminToolkit for Arma 3 -**Version 2.0.3** | Author: ole1986 | This work is licensed under a Creative Commons Attribution-NonCommercial 4.0 International License +**Version 2.0.4** | Author: ole1986 | This work is licensed under a Creative Commons Attribution-NonCommercial 4.0 International License The ATK is used to administrate Arma 3 multiplayer servers and be extended with user extensions diff --git a/setup.ps1 b/setup.ps1 index ac6cf8b..d61d9fa 100644 --- a/setup.ps1 +++ b/setup.ps1 @@ -98,15 +98,15 @@ if(!(Test-Path $GameFolder)) { if($Build) { Write-Host "Building Server PBO" - $ok = Pack-Pbo "source\admintoolkit_server" "@AdminToolkitServer\addons" + $ok = Pack-Pbo "$PWD\source\admintoolkit_server" "$PWD\@AdminToolkitServer\addons" if(!$ok) { Exit } Write-Host "Building Server Config PBO" - $ok = Pack-Pbo "source\admintoolkit_servercfg" "@AdminToolkitServer\addons" + $ok = Pack-Pbo "$PWD\source\admintoolkit_servercfg" "$PWD\@AdminToolkitServer\addons" if(!$ok) { Exit } Write-Host "Building Client PBO" - $ok = Pack-Pbo "source\admintoolkit" "@AdminToolkit\addons" "admintoolkit.biprivatekey" + $ok = Pack-Pbo "$PWD\source\admintoolkit" "$PWD\@AdminToolkit\addons" "$PWD\admintoolkit.biprivatekey" if(!$ok) { Exit } Write-Host -ForegroundColor Green "###################" @@ -129,7 +129,7 @@ if($Install) { Start-Sleep 2 Write-Host -NoNewline "Installing AdminToolkit client into $GameFolder..." - Copy-Item -Recurse .\@AdminToolkit -Destination $GameFolder -Force + Copy-Item -Recurse $PWD\@AdminToolkit -Destination $GameFolder -Force Write-Host -ForegroundColor Green "DONE" if($Run) { Write-Host -NoNewline "Running Arma 3..." @@ -140,7 +140,7 @@ if($Install) { if($PatchMission) { Write-Host -ForegroundColor Green "Please select your mission file from the dialog:" - $missionFile = Get-FileName($PSScriptRoot) + $missionFile = Get-FileName($PWD) if(!$missionFile) { Write-Host "Canceled by user action" @@ -161,7 +161,7 @@ if($PatchMission) { } Write-Host "Copying mission related files into $extractedPath" - Copy-Item "source\mission_file\*" -Destination "$extractedPath" -Recurse -Force + Copy-Item "$PWD\source\mission_file\*" -Destination "$extractedPath" -Recurse -Force Write-Host -NoNewline "Trying to patch file $extractedPath\description.ext..." @@ -179,7 +179,7 @@ if($PatchMission) { } Write-Host "Building mission file '$extractedFolder'..." - if(! (Pack-Pbo "$extractedPath" "@MissionFile")) { + if(! (Pack-Pbo "$extractedPath" "$PWD\@MissionFile")) { Exit }